diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9b6a861..c573944 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -5,7 +5,6 @@
 import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -285,19 +284,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9b6a861..c573944 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -5,7 +5,6 @@
 import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -285,19 +284,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index cbbb01d..d97b3b4 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -2,7 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import userListDialog from '../person/components/userListDialog.vue'
-import type { IOptions } from './plan_interface'
+import type { IaddPersonListType, IformInlineType } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
@@ -29,23 +29,23 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
-  createTime: null,
-  deptId: '',
-  deptName: null,
-  director: '',
-  effectiveCompany: null,
-  id: '',
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: '',
+const formInline = ref<IformInlineType>({
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  deptName: '', // 部门名称
+  director: '', // 负责人
+  effectiveCompany: '',
+  id: '', // 主键
+  planName: '', // 培训名称
+  planNo: '', // 培训编号
+  remark: '', // 备注
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainHour: '', // 培训学时
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训人员
+  trainStaffList: [], // 人员信息
+  trainTime: '', // 培训时间
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -56,17 +56,17 @@
   { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref({
+const addPersonList = ref<IaddPersonListType>({
   company: '',
   examResult: '',
-  id: 0,
+  id: '',
   name: '',
   remark: '',
   signTime: '',
-  staffId: 0,
+  staffId: '',
   technologyJob: '',
 })
-const SelectionList = ref([])
+const SelectionList = ref<IaddPersonListType[]>([])
 // 校验规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
@@ -123,7 +123,7 @@
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
+    (item: IaddPersonListType) => {
       return !SelectionList.value.includes(item)
     },
   )
@@ -133,16 +133,12 @@
   SelectionList.value = e
 }
 // 负责人类型
-interface confirmPersonType {
-  name: string
-}
-// 负责人类型
 interface trainStaffListType {
   updateTime: string
   createTime: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: confirmPersonType) => {
+const confirmPerson = (object: IaddPersonListType) => {
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -151,7 +147,7 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: confirmPersonType) => {
+const confirmTrainPerson = (object: IaddPersonListType) => {
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -183,7 +179,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item: trainStaffListType) => {
+          formInline.value.trainStaffList.map((item: IaddPersonListType) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -235,13 +231,20 @@
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="pageType === 'detail' ? printObj : ''"
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')
+            getAddList(ruleFormRef, '提交')
           "
         >
-          {{ pageType === 'detail' ? '打印' : '提交' }}
+          提交
+        </el-button>
+        <el-button
+          v-if="pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
+          打印
         </el-button>
         <el-button
           type="primary"
@@ -327,6 +330,7 @@
               <dept-select
                 ref="deptSelect"
                 v-model="formInline.deptId"
+                :placeholder="pageType === 'detail' ? '无' : '请选择主管部门'"
                 :disabled="pageType === 'detail'"
                 :dept-show="true"
               />

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9b6a861..c573944 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -5,7 +5,6 @@
 import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -285,19 +284,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index cbbb01d..d97b3b4 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -2,7 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import userListDialog from '../person/components/userListDialog.vue'
-import type { IOptions } from './plan_interface'
+import type { IaddPersonListType, IformInlineType } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
@@ -29,23 +29,23 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
-  createTime: null,
-  deptId: '',
-  deptName: null,
-  director: '',
-  effectiveCompany: null,
-  id: '',
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: '',
+const formInline = ref<IformInlineType>({
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  deptName: '', // 部门名称
+  director: '', // 负责人
+  effectiveCompany: '',
+  id: '', // 主键
+  planName: '', // 培训名称
+  planNo: '', // 培训编号
+  remark: '', // 备注
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainHour: '', // 培训学时
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训人员
+  trainStaffList: [], // 人员信息
+  trainTime: '', // 培训时间
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -56,17 +56,17 @@
   { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref({
+const addPersonList = ref<IaddPersonListType>({
   company: '',
   examResult: '',
-  id: 0,
+  id: '',
   name: '',
   remark: '',
   signTime: '',
-  staffId: 0,
+  staffId: '',
   technologyJob: '',
 })
-const SelectionList = ref([])
+const SelectionList = ref<IaddPersonListType[]>([])
 // 校验规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
@@ -123,7 +123,7 @@
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
+    (item: IaddPersonListType) => {
       return !SelectionList.value.includes(item)
     },
   )
@@ -133,16 +133,12 @@
   SelectionList.value = e
 }
 // 负责人类型
-interface confirmPersonType {
-  name: string
-}
-// 负责人类型
 interface trainStaffListType {
   updateTime: string
   createTime: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: confirmPersonType) => {
+const confirmPerson = (object: IaddPersonListType) => {
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -151,7 +147,7 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: confirmPersonType) => {
+const confirmTrainPerson = (object: IaddPersonListType) => {
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -183,7 +179,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item: trainStaffListType) => {
+          formInline.value.trainStaffList.map((item: IaddPersonListType) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -235,13 +231,20 @@
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="pageType === 'detail' ? printObj : ''"
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')
+            getAddList(ruleFormRef, '提交')
           "
         >
-          {{ pageType === 'detail' ? '打印' : '提交' }}
+          提交
+        </el-button>
+        <el-button
+          v-if="pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
+          打印
         </el-button>
         <el-button
           type="primary"
@@ -327,6 +330,7 @@
               <dept-select
                 ref="deptSelect"
                 v-model="formInline.deptId"
+                :placeholder="pageType === 'detail' ? '无' : '请选择主管部门'"
                 :disabled="pageType === 'detail'"
                 :dept-show="true"
               />
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 9888dd5..7d5f791 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -1,33 +1,3 @@
-export interface IlistQuery {
-  deptId: string
-  effectiveCompany: string
-  director: string
-  offset: number
-  limit: number
-  formId: string
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  trainEndTime: string
-  trainStartTime: string
-}
-
-export interface IlistType {
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
-}
-
 export interface lPlanistQuery {
   createEndTime: string // 创建结束时间
   createStartTime: string // 创建开始时间
@@ -42,88 +12,131 @@
   limit: number // 每页多少条
 }
 
-// 培训审批查询条件
-export interface IApprovallistQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
-  ids?: []
-}
 // 培训计划列表数据
 export interface IPlanList {
-  deptId: string
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  id: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  processId: string
-  trainStaffList: [
-    {
-      company: string
-      examResult: string
-      id: number
-      name: string
-      remark: string
-      signTime: string
-      staffId: number
-      technologyJob: string
-    },
-  ]
-  taskId?: string
-  trainTime: string
+  deptId: string // 部门id
+  createTime: string // 创建时间
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  processId: string // 审批id
+  trainStaffList: IObject[] // 学员列表
+  taskId?: string // 任务id
+  trainTime: string // 培训时间
 }
-
+// 下拉框类型
 export interface IOptions {
-  id: string
-  name: string
-  planName: string
+  id: string // id
+  name: string // 名称
+  planName: string // 培训名称
 }
-
+// 培训计划审批列表查询条件
 export interface IlistApprovalQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  trainTime: string // 培训时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
-export interface IlistTypes {
-  createTime: string
-  deptName: string
-  director: string
-  logNo: string
-  planName: string
-  trainName: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
+// 培训记录查询条件类型
+export interface ItrainLoglistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  ids: string[] // id集合
+  logNo: string // 记录编号
+  trainEndTime: string // 培训结束时间
+  trainName: string // 培训名称
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
+// 审批每列的按钮
 export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
+  name: string // 按钮名字
+  type: '' | 'default' | 'primary' | 'danger' | 'text' | 'success' | 'warning' | 'info' // 按钮类型
+  permission?: string // 按钮权限
+}
+
+// 添加人员类型
+export interface IObject {
+  company: string // 单位名称
+  examResult: string // 考核结果
+  name: string // 学员名称
+  remark: string // 备注
+  signTime: string // 签到时间
+  technologyJob: string // 技术职称
+  planId: string // 培训id
+  staffId?: string // 任务id
+  isNameShow?: boolean
+  updateTime?: string
+  createTime?: string
+  id?: string
+}
+
+// 培训记录新增详情
+export interface ITrinLogFormInline {
+  improveMethod: string // 改进措施
+  logNo: string // 记录编号
+  preparer: string // 人员
+  problems: string // 存在问题
+  planId: string // 培训id
+  planNo: string // 培训计划编号
+  remark: string // 备注
+  id: string // 主键id
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  trainStaffList: IObject[] // 培训人员列表
+  trainTime: string // 培训时间
+}
+// 新增人员信息对象类型
+export interface IaddPersonListType {
+  company: string
+  examResult: string
+  id: string
+  name: string // 名称
+  remark: string
+  signTime: string
+  staffId: string
+  technologyJob: string
+  updateTime?: string // 更新时间
+  createTime?: string // 创建时间
+}
+
+export interface IformInlineType {
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainHour: string // 培训学时
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训人员
+  trainStaffList: IaddPersonListType[] // 人员信息
+  trainTime: string // 培训时间
 }

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9b6a861..c573944 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -5,7 +5,6 @@
 import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -285,19 +284,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index cbbb01d..d97b3b4 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -2,7 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import userListDialog from '../person/components/userListDialog.vue'
-import type { IOptions } from './plan_interface'
+import type { IaddPersonListType, IformInlineType } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
@@ -29,23 +29,23 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
-  createTime: null,
-  deptId: '',
-  deptName: null,
-  director: '',
-  effectiveCompany: null,
-  id: '',
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: '',
+const formInline = ref<IformInlineType>({
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  deptName: '', // 部门名称
+  director: '', // 负责人
+  effectiveCompany: '',
+  id: '', // 主键
+  planName: '', // 培训名称
+  planNo: '', // 培训编号
+  remark: '', // 备注
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainHour: '', // 培训学时
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训人员
+  trainStaffList: [], // 人员信息
+  trainTime: '', // 培训时间
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -56,17 +56,17 @@
   { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref({
+const addPersonList = ref<IaddPersonListType>({
   company: '',
   examResult: '',
-  id: 0,
+  id: '',
   name: '',
   remark: '',
   signTime: '',
-  staffId: 0,
+  staffId: '',
   technologyJob: '',
 })
-const SelectionList = ref([])
+const SelectionList = ref<IaddPersonListType[]>([])
 // 校验规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
@@ -123,7 +123,7 @@
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
+    (item: IaddPersonListType) => {
       return !SelectionList.value.includes(item)
     },
   )
@@ -133,16 +133,12 @@
   SelectionList.value = e
 }
 // 负责人类型
-interface confirmPersonType {
-  name: string
-}
-// 负责人类型
 interface trainStaffListType {
   updateTime: string
   createTime: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: confirmPersonType) => {
+const confirmPerson = (object: IaddPersonListType) => {
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -151,7 +147,7 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: confirmPersonType) => {
+const confirmTrainPerson = (object: IaddPersonListType) => {
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -183,7 +179,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item: trainStaffListType) => {
+          formInline.value.trainStaffList.map((item: IaddPersonListType) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -235,13 +231,20 @@
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="pageType === 'detail' ? printObj : ''"
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')
+            getAddList(ruleFormRef, '提交')
           "
         >
-          {{ pageType === 'detail' ? '打印' : '提交' }}
+          提交
+        </el-button>
+        <el-button
+          v-if="pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
+          打印
         </el-button>
         <el-button
           type="primary"
@@ -327,6 +330,7 @@
               <dept-select
                 ref="deptSelect"
                 v-model="formInline.deptId"
+                :placeholder="pageType === 'detail' ? '无' : '请选择主管部门'"
                 :disabled="pageType === 'detail'"
                 :dept-show="true"
               />
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 9888dd5..7d5f791 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -1,33 +1,3 @@
-export interface IlistQuery {
-  deptId: string
-  effectiveCompany: string
-  director: string
-  offset: number
-  limit: number
-  formId: string
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  trainEndTime: string
-  trainStartTime: string
-}
-
-export interface IlistType {
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
-}
-
 export interface lPlanistQuery {
   createEndTime: string // 创建结束时间
   createStartTime: string // 创建开始时间
@@ -42,88 +12,131 @@
   limit: number // 每页多少条
 }
 
-// 培训审批查询条件
-export interface IApprovallistQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
-  ids?: []
-}
 // 培训计划列表数据
 export interface IPlanList {
-  deptId: string
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  id: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  processId: string
-  trainStaffList: [
-    {
-      company: string
-      examResult: string
-      id: number
-      name: string
-      remark: string
-      signTime: string
-      staffId: number
-      technologyJob: string
-    },
-  ]
-  taskId?: string
-  trainTime: string
+  deptId: string // 部门id
+  createTime: string // 创建时间
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  processId: string // 审批id
+  trainStaffList: IObject[] // 学员列表
+  taskId?: string // 任务id
+  trainTime: string // 培训时间
 }
-
+// 下拉框类型
 export interface IOptions {
-  id: string
-  name: string
-  planName: string
+  id: string // id
+  name: string // 名称
+  planName: string // 培训名称
 }
-
+// 培训计划审批列表查询条件
 export interface IlistApprovalQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  trainTime: string // 培训时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
-export interface IlistTypes {
-  createTime: string
-  deptName: string
-  director: string
-  logNo: string
-  planName: string
-  trainName: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
+// 培训记录查询条件类型
+export interface ItrainLoglistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  ids: string[] // id集合
+  logNo: string // 记录编号
+  trainEndTime: string // 培训结束时间
+  trainName: string // 培训名称
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
+// 审批每列的按钮
 export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
+  name: string // 按钮名字
+  type: '' | 'default' | 'primary' | 'danger' | 'text' | 'success' | 'warning' | 'info' // 按钮类型
+  permission?: string // 按钮权限
+}
+
+// 添加人员类型
+export interface IObject {
+  company: string // 单位名称
+  examResult: string // 考核结果
+  name: string // 学员名称
+  remark: string // 备注
+  signTime: string // 签到时间
+  technologyJob: string // 技术职称
+  planId: string // 培训id
+  staffId?: string // 任务id
+  isNameShow?: boolean
+  updateTime?: string
+  createTime?: string
+  id?: string
+}
+
+// 培训记录新增详情
+export interface ITrinLogFormInline {
+  improveMethod: string // 改进措施
+  logNo: string // 记录编号
+  preparer: string // 人员
+  problems: string // 存在问题
+  planId: string // 培训id
+  planNo: string // 培训计划编号
+  remark: string // 备注
+  id: string // 主键id
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  trainStaffList: IObject[] // 培训人员列表
+  trainTime: string // 培训时间
+}
+// 新增人员信息对象类型
+export interface IaddPersonListType {
+  company: string
+  examResult: string
+  id: string
+  name: string // 名称
+  remark: string
+  signTime: string
+  staffId: string
+  technologyJob: string
+  updateTime?: string // 更新时间
+  createTime?: string // 创建时间
+}
+
+export interface IformInlineType {
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainHour: string // 培训学时
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训人员
+  trainStaffList: IaddPersonListType[] // 人员信息
+  trainTime: string // 培训时间
 }
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 37057f2..d623767 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -2,22 +2,22 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import type { IlistQuerys, IlistTypes } from './plan_interface'
+import type { ItrainLoglistQuery } from './plan_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  ids: [],
-  logNo: '',
-  trainEndTime: '',
-  trainName: '',
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<ItrainLoglistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  ids: [], // id集合
+  logNo: '', // 记录编号
+  trainEndTime: '', // 培训结束时间
+  trainName: '', // 培训名称
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
 const list = ref([])
@@ -110,15 +110,15 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    ids: [],
-    logNo: '',
-    trainEndTime: '',
-    trainName: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    ids: [], // id集合
+    logNo: '', // 记录编号
+    trainEndTime: '', // 培训结束时间
+    trainName: '', // 培训名称
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -160,13 +160,15 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/train/trainLog/${pageType}/${row.id}`)
 }
-const handelClick = (text: string) => {}
+// 表格多选框
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/trainLog/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -215,91 +217,82 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.logNo"
-            placeholder="培训记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.trainName"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <!-- <el-date-picker
-            v-model="listQuery.trainTime"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-          /> -->
-          <el-date-picker
-            v-model="trainTime"
-            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-item>
-          <el-date-picker
-            v-model="createTime"
-            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 v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.logNo"
+          placeholder="培训记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.trainName"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          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-item>
+        <el-date-picker
+          v-model="createTime"
+          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 v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </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="140">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/tarnLog/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>
+            </template>
+          </el-table-column>
         </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="140">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/tarnLog/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>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
 

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9b6a861..c573944 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -5,7 +5,6 @@
 import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -285,19 +284,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index cbbb01d..d97b3b4 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -2,7 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import userListDialog from '../person/components/userListDialog.vue'
-import type { IOptions } from './plan_interface'
+import type { IaddPersonListType, IformInlineType } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
@@ -29,23 +29,23 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
-  createTime: null,
-  deptId: '',
-  deptName: null,
-  director: '',
-  effectiveCompany: null,
-  id: '',
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: '',
+const formInline = ref<IformInlineType>({
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  deptName: '', // 部门名称
+  director: '', // 负责人
+  effectiveCompany: '',
+  id: '', // 主键
+  planName: '', // 培训名称
+  planNo: '', // 培训编号
+  remark: '', // 备注
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainHour: '', // 培训学时
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训人员
+  trainStaffList: [], // 人员信息
+  trainTime: '', // 培训时间
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -56,17 +56,17 @@
   { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref({
+const addPersonList = ref<IaddPersonListType>({
   company: '',
   examResult: '',
-  id: 0,
+  id: '',
   name: '',
   remark: '',
   signTime: '',
-  staffId: 0,
+  staffId: '',
   technologyJob: '',
 })
-const SelectionList = ref([])
+const SelectionList = ref<IaddPersonListType[]>([])
 // 校验规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
@@ -123,7 +123,7 @@
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
+    (item: IaddPersonListType) => {
       return !SelectionList.value.includes(item)
     },
   )
@@ -133,16 +133,12 @@
   SelectionList.value = e
 }
 // 负责人类型
-interface confirmPersonType {
-  name: string
-}
-// 负责人类型
 interface trainStaffListType {
   updateTime: string
   createTime: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: confirmPersonType) => {
+const confirmPerson = (object: IaddPersonListType) => {
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -151,7 +147,7 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: confirmPersonType) => {
+const confirmTrainPerson = (object: IaddPersonListType) => {
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -183,7 +179,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item: trainStaffListType) => {
+          formInline.value.trainStaffList.map((item: IaddPersonListType) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -235,13 +231,20 @@
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="pageType === 'detail' ? printObj : ''"
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')
+            getAddList(ruleFormRef, '提交')
           "
         >
-          {{ pageType === 'detail' ? '打印' : '提交' }}
+          提交
+        </el-button>
+        <el-button
+          v-if="pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
+          打印
         </el-button>
         <el-button
           type="primary"
@@ -327,6 +330,7 @@
               <dept-select
                 ref="deptSelect"
                 v-model="formInline.deptId"
+                :placeholder="pageType === 'detail' ? '无' : '请选择主管部门'"
                 :disabled="pageType === 'detail'"
                 :dept-show="true"
               />
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 9888dd5..7d5f791 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -1,33 +1,3 @@
-export interface IlistQuery {
-  deptId: string
-  effectiveCompany: string
-  director: string
-  offset: number
-  limit: number
-  formId: string
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  trainEndTime: string
-  trainStartTime: string
-}
-
-export interface IlistType {
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
-}
-
 export interface lPlanistQuery {
   createEndTime: string // 创建结束时间
   createStartTime: string // 创建开始时间
@@ -42,88 +12,131 @@
   limit: number // 每页多少条
 }
 
-// 培训审批查询条件
-export interface IApprovallistQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
-  ids?: []
-}
 // 培训计划列表数据
 export interface IPlanList {
-  deptId: string
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  id: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  processId: string
-  trainStaffList: [
-    {
-      company: string
-      examResult: string
-      id: number
-      name: string
-      remark: string
-      signTime: string
-      staffId: number
-      technologyJob: string
-    },
-  ]
-  taskId?: string
-  trainTime: string
+  deptId: string // 部门id
+  createTime: string // 创建时间
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  processId: string // 审批id
+  trainStaffList: IObject[] // 学员列表
+  taskId?: string // 任务id
+  trainTime: string // 培训时间
 }
-
+// 下拉框类型
 export interface IOptions {
-  id: string
-  name: string
-  planName: string
+  id: string // id
+  name: string // 名称
+  planName: string // 培训名称
 }
-
+// 培训计划审批列表查询条件
 export interface IlistApprovalQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  trainTime: string // 培训时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
-export interface IlistTypes {
-  createTime: string
-  deptName: string
-  director: string
-  logNo: string
-  planName: string
-  trainName: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
+// 培训记录查询条件类型
+export interface ItrainLoglistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  ids: string[] // id集合
+  logNo: string // 记录编号
+  trainEndTime: string // 培训结束时间
+  trainName: string // 培训名称
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
+// 审批每列的按钮
 export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
+  name: string // 按钮名字
+  type: '' | 'default' | 'primary' | 'danger' | 'text' | 'success' | 'warning' | 'info' // 按钮类型
+  permission?: string // 按钮权限
+}
+
+// 添加人员类型
+export interface IObject {
+  company: string // 单位名称
+  examResult: string // 考核结果
+  name: string // 学员名称
+  remark: string // 备注
+  signTime: string // 签到时间
+  technologyJob: string // 技术职称
+  planId: string // 培训id
+  staffId?: string // 任务id
+  isNameShow?: boolean
+  updateTime?: string
+  createTime?: string
+  id?: string
+}
+
+// 培训记录新增详情
+export interface ITrinLogFormInline {
+  improveMethod: string // 改进措施
+  logNo: string // 记录编号
+  preparer: string // 人员
+  problems: string // 存在问题
+  planId: string // 培训id
+  planNo: string // 培训计划编号
+  remark: string // 备注
+  id: string // 主键id
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  trainStaffList: IObject[] // 培训人员列表
+  trainTime: string // 培训时间
+}
+// 新增人员信息对象类型
+export interface IaddPersonListType {
+  company: string
+  examResult: string
+  id: string
+  name: string // 名称
+  remark: string
+  signTime: string
+  staffId: string
+  technologyJob: string
+  updateTime?: string // 更新时间
+  createTime?: string // 创建时间
+}
+
+export interface IformInlineType {
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainHour: string // 培训学时
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训人员
+  trainStaffList: IaddPersonListType[] // 人员信息
+  trainTime: string // 培训时间
 }
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 37057f2..d623767 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -2,22 +2,22 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import type { IlistQuerys, IlistTypes } from './plan_interface'
+import type { ItrainLoglistQuery } from './plan_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  ids: [],
-  logNo: '',
-  trainEndTime: '',
-  trainName: '',
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<ItrainLoglistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  ids: [], // id集合
+  logNo: '', // 记录编号
+  trainEndTime: '', // 培训结束时间
+  trainName: '', // 培训名称
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
 const list = ref([])
@@ -110,15 +110,15 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    ids: [],
-    logNo: '',
-    trainEndTime: '',
-    trainName: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    ids: [], // id集合
+    logNo: '', // 记录编号
+    trainEndTime: '', // 培训结束时间
+    trainName: '', // 培训名称
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -160,13 +160,15 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/train/trainLog/${pageType}/${row.id}`)
 }
-const handelClick = (text: string) => {}
+// 表格多选框
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/trainLog/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -215,91 +217,82 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.logNo"
-            placeholder="培训记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.trainName"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <!-- <el-date-picker
-            v-model="listQuery.trainTime"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-          /> -->
-          <el-date-picker
-            v-model="trainTime"
-            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-item>
-          <el-date-picker
-            v-model="createTime"
-            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 v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.logNo"
+          placeholder="培训记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.trainName"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          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-item>
+        <el-date-picker
+          v-model="createTime"
+          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 v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </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="140">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/tarnLog/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>
+            </template>
+          </el-table-column>
         </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="140">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/tarnLog/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>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
 
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 6301859..77ca707 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="planlogAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions } from './plan_interface'
+import type { IObject, IOptions, ITrinLogFormInline } from './plan_interface'
 import userListDialog from './components/userListDialog.vue'
 import PlanListDialog from './components/planListDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import useUserStore from '@/store/modules/user.ts'
+import useUserStore from '@/store/modules/user'
 import {
   getListDetail,
   getListLogAdd,
@@ -16,7 +16,6 @@
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -31,32 +30,35 @@
   }
 }
 const { name } = useUserStore()
+// 数据校验ref
 const ruleFormRef = ref<FormInstance>()
-const formInline = ref({
-  improveMethod: '',
-  logNo: '',
-  preparer: name || '',
-  problems: '',
-  planId: '',
-  remark: '',
-  id: '',
-  trainAddress: '',
-  trainContent: '',
-  trainEffect: '',
-  trainHour: '',
-  trainName: '',
-  trainNumber: '',
-  trainPerson: '',
-  trainStaffList: [],
-  trainTime: '',
+// 培训记录新增数据
+const formInline = ref<ITrinLogFormInline>({
+  improveMethod: '', // 改进措施
+  logNo: '', // 记录编号
+  preparer: name || '', // 人员
+  problems: '', // 存在问题
+  planId: '', // 培训id
+  planNo: '', // 培训计划编号
+  remark: '', // 备注
+  id: '', // 主键id
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainEffect: '', // 培训效果
+  trainHour: '', // 培训学时
+  trainName: '', // 培训名称
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训对象
+  trainStaffList: [], // 培训人员列表
+  trainTime: '', // 培训时间
 })
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 // 下面列表用的
-const trainList = ref([])
+const trainList = ref<IObject[]>([])
+// 表头
 const columns = [
-  // { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company', required: true },
   { text: '技术职称', value: 'technologyJob', required: true },
   { text: '签到时间', value: 'signTime', required: true },
@@ -66,10 +68,12 @@
 const rules = ref({
   logNo: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
   preparer: [{ required: true, message: '填表人不能为空', trigger: ['blur', 'change'] }],
-  planId: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
+  planNo: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
   trainName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
   trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
+  ],
   trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
   trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
   trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
@@ -79,17 +83,18 @@
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userListRef = ref()
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  name: '',
-  remark: '',
-  signTime: '',
-  technologyJob: '',
-  planId: 0,
-  staffId: 0,
+// 新增学员对象
+const addPersonList = ref<IObject>({
+  company: '', // 单位名称
+  examResult: '', // 考核结果
+  name: '', // 学员名称
+  remark: '', // 备注
+  signTime: '', // 签到时间
+  technologyJob: '', // 技术职称
+  planId: '', // 培训id
+  staffId: '', // 任务id
 })
-const SelectionList = ref([])
+const SelectionList = ref<IObject[]>([])
 const ListDetail = ref([])
 // 控制是否显示输入框开关
 const isNameShow = ref(true)
@@ -99,22 +104,25 @@
 const close = () => {
   $router.back()
 }
-const addRoow = () => {
+// 新增行
+const addRow = () => {
   if (formInline.value.planId === '') {
     return ElMessage.warning('还未选择计划编号')
   }
-  const object = {
-    company: '',
-    examResult: '',
-    name: '',
-    remark: '',
-    signTime: '',
-    technologyJob: '',
-    planId: '',
-    staffId: '',
-    isNameShow: false,
-  }
-  trainList.value.push(object)
+  const object = ref<IObject>(
+    {
+      company: '', // 单位名称
+      examResult: '', // 考核结果
+      name: '', // 学员名称
+      remark: '', // 备注
+      signTime: '', // 签到时间
+      technologyJob: '', // 技术职称
+      planId: '', // 培训id
+      staffId: '', // 任务id
+      isNameShow: false,
+    },
+  )
+  trainList.value.push(object.value)
 }
 // 点击关闭
 const handleClose = () => {
@@ -133,11 +141,12 @@
 // 删除行
 const deleteList = () => {
   trainList.value = trainList.value.filter(
-    (item) => {
+    (item: IObject) => {
       return !SelectionList.value.includes(item)
     },
   )
 }
+// 下拉框
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
@@ -148,6 +157,7 @@
 const addPersonListChange = (e: string) => {
   addPersonList.value = ListDetail.value.filter((item: itemReturn) => item.staffId === e)[0]
 }
+// 只要有id就会获取详情
 if (infoId.value && infoId.value !== '') {
   getListLogDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
@@ -158,12 +168,14 @@
 interface rowReturn {
   isNameShow: boolean
   id: string
+  planNo: string
   planName: string
 }
 // 双击表格中默认显示的name
 const dblclickName = (row: rowReturn) => {
   row.isNameShow = true
 }
+// 提交按钮
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
@@ -187,7 +199,7 @@
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
           formInline.value.trainStaffList = trainList.value
-          formInline.value.trainStaffList.map((item) => {
+          formInline.value.trainStaffList.map((item: IObject) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -199,21 +211,20 @@
             }
           })
         }
-        else {
-          // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
-        }
       })
     }
   })
 }
+
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 const listIndex = ref(0)
 // 选择人员
 const selectPerson = (index: number) => {
@@ -232,12 +243,12 @@
     ListDetail.value = res.data.trainStaffList
     res.data.preparer = name
     formInline.value = { ...res.data }
-    formInline.value.planId = data.id
+    formInline.value.planNo = data.planNo
     formInline.value.trainName = data.planName
   })
 }
 // 选择完负责人的函数
-const confirmPerson = (object: rowReturn) => {
+const confirmPerson = (object: IObject) => {
   if (!trainList.value.includes(object)) {
     trainList.value[listIndex.value] = object
     trainList.value[listIndex.value].staffId = object.id
@@ -299,9 +310,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planId">
+            <el-form-item label="计划编号:" prop="planNo">
               <el-input
-                v-model="formInline.planId"
+                v-model="formInline.planNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择计划编号'"
                 :disabled="pageType === 'detail'"
               >
@@ -361,8 +372,8 @@
                 v-model="formInline.trainTime"
                 type="datetime"
                 placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -441,7 +452,7 @@
         <el-button v-if="pageType !== 'detail'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRow">
           增加行
         </el-button>
       </template>
@@ -477,8 +488,8 @@
               v-model="scope.row[item.value]"
               type="datetime"
               :placeholder="`${item.text}`"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="pageType === 'detail'"
             />
             <el-input v-if="item.text !== '签到时间'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />

diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index d2938a3..36f5104 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -433,7 +433,7 @@
       },
       {
         path: 'maintenanceCheckList/:type/:id?/:processId?',
-        name: 'maintenanceCheckAdd',
+        name: 'ListApprovalAdd',
         component: () => import('@/views/device/deviceMaintenance/components/listApprovalAdd.vue'),
         meta: {
           title: '设备检修保养验收单',
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
index 133c46a..775f6ab 100644
--- a/src/views/business/lab/environmental/environmentalAdd.vue
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import type { selectionListItem } from './environmentalList_interface'
-import { SCHEDULE } from '@/utils/scheduleDict'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordAdd, getenvironmentRecordDetail, getenvironmentRecordUpdate } from '@/api/business/environmentRecord/environmentRecord'
 import useUserStore from '@/store/modules/user'
 const infoId = ref('') // id
@@ -34,17 +34,19 @@
   remark: '', // 备注
   recordTime: dayjs(`${new Date()}`).format('YYYY-MM-DD hh:mm:ss'), // 记录时间
   createUser: id || '', // 记录人id
+  createTime: '',
+  id: '',
+  updateTime: '',
 })
-const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 
 // 房间号模拟下拉框数据
-const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
-])
+const selectionList = ref<selectionListItem[]>([])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
+
 // 校验规则
 const rules = ref({
   roomNumber: [{ required: true, message: '房间号不能为空', trigger: ['blur', 'change'] }],
@@ -71,11 +73,13 @@
   $router.back()
 }
 
-// if (infoId.value && infoId.value !== '') {
-//   getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
-//     formInline.value = res.data
-//   })
-// }
+if (infoId.value && infoId.value !== '') {
+  getenvironmentRecordDetail({ id: infoId.value }).then((res) => {
+    if (res.code === 200) {
+      formInline.value = res.data
+    }
+  })
+}
 // 点击保存
 const preserve = async (formEl: FormInstance | undefined) => {
   if (!formEl) {
@@ -89,20 +93,18 @@
         type: 'warning',
       }).then(() => {
         if (pageType.value === 'add') {
-          // getenvironmentRecordAdd(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordAdd(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
         else {
-          // getenvironmentRecordUpdate(formInline.value).then((res) => {
-        //   if (res.code === 200) {
-        //     addId.value = res.data.id
-        //     ElMessage.success('保存成功！')
-        //   }
-        // })
+          getenvironmentRecordUpdate(formInline.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('提交成功！')
+            }
+          })
         }
       })
     }
@@ -171,7 +173,7 @@
                 <el-option
                   v-for="item in selectionList"
                   :key="item.value"
-                  :label="item.label"
+                  :label="item.name"
                   :value="item.value"
                 />
               </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
index 73b53a0..89ca614 100644
--- a/src/views/business/lab/environmental/environmentalList.vue
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup name="EnvironmentalList">
 import type { Ref } from 'vue'
-import { getCurrentInstance, reactive, ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IEnvironmental, selectionListItem } from './environmentalList_interface'
-import QrDialog from '@/components/QrDialog/index.vue'
+import { getTypeSelect } from '@/api/system/price'
 import { getenvironmentRecordDelete, getenvironmentRecordList } from '@/api/business/environmentRecord/environmentRecord'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   environmentCode: '', // 记录单编号
   roomNumber: '', // 房间号
@@ -36,36 +34,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getenvironmentRecordList(listQuery.value).then((res) => {
-
-  // })
-  list.value = [{
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '1',
-  },
-  {
-    environmentCode: 'A001',
-    roomNumber: '1',
-    recorder: '张三',
-    temperature: '25',
-    humidity: '3',
-    outputVoltage: '220',
-    zeroGroundVoltage: '2',
-    remark: '备注',
-    recordTime: '2022-12-12 10:10:10',
-    createUser: '100000',
-    id: '2',
-  },
-  ]
+  getenvironmentRecordList(listQuery.value).then((res) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+  })
   loadingTable.value = false
 }
 fetchData(true)
@@ -154,7 +126,7 @@
 // 点击编辑id和删除row类型
 interface rowReturn {
   id: string
-  roomNumber: string
+  environmentCode: string
 }
 // 点击编辑/详情
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
@@ -163,7 +135,7 @@
 // 点击删除
 const handleDelete = (index: string, row: rowReturn) => {
   ElMessageBox.confirm(
-    `确认删除${row.roomNumber}吗？`,
+    `确认删除${row.environmentCode}吗？`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -172,15 +144,15 @@
     },
   )
     .then(() => {
-      // getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
-      //   if (res.code === 200) {
-      //     ElMessage({
-      //       type: 'success',
-      //       message: '删除成功',
-      //     })
-      //     fetchData(true)
-      //   }
-      // })
+      getenvironmentRecordDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
     })
 }
 
@@ -206,11 +178,11 @@
 }
 // 房间号模拟下拉框数据
 const selectionList = ref<selectionListItem[]>([
-  { label: '101', value: '101' },
-  { label: '102', value: '102' },
-  { label: '103', value: '103' },
-  { label: '104', value: '104' },
 ])
+// 获取下拉框数据
+getTypeSelect('roomNumber').then((res) => {
+  selectionList.value = res.data
+})
 // 打印列表
 function printList() {
   // 打印列
@@ -255,7 +227,7 @@
             <el-option
               v-for="item in selectionList"
               :key="item.value"
-              :label="item.label"
+              :label="item.name"
               :value="item.value"
             />
           </el-select>
diff --git a/src/views/business/lab/environmental/environmentalList_interface.ts b/src/views/business/lab/environmental/environmentalList_interface.ts
index 380583b..955af81 100644
--- a/src/views/business/lab/environmental/environmentalList_interface.ts
+++ b/src/views/business/lab/environmental/environmentalList_interface.ts
@@ -15,5 +15,6 @@
 // 房间号模拟下拉框数据类型
 export interface selectionListItem {
   value: string // 值
-  label: string // lable
+  name: string // lable
+  id: string
 }
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 8cd172d..48dd59c 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -2,7 +2,6 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -11,23 +10,22 @@
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  ids: [],
-  trainEndTime: '',
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  trainStartTime: '',
-  testCategory: '',
-  offset: 1,
-  limit: 20,
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 原始记录编号
+  ids: [], // 导出集合
+  trainEndTime: '', // 结束时间
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  trainStartTime: '', // 开始时间
+  testCategory: '', // 检测类别
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
-const list = ref<ISupplier[]>([])
-const total = ref(0)
-const show = ref(true)
+const list = ref([]) // 数据列表
+const total = ref(0) // 总条数
 
 const loadingTable = ref(false)
 // 初始化路由
@@ -43,7 +41,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  list.value = [{ text: 'xxx' }]
+  list.value = []
   loadingTable.value = false
 }
 fetchData(true)
@@ -58,58 +56,16 @@
 const { proxy } = getCurrentInstance() as any
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '原始记录编号',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '原始记录名称',
-    value: 'text',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '样品编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '样品名称',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '出厂编号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '型号',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '检校类别',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'text',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'text',
-    align: 'center',
-  },
+  { text: '原始记录编号', value: 'text', width: '120', align: 'center' },
+  { text: '原始记录名称', value: 'text', width: '120', align: 'center' },
+  { text: '样品编号', value: 'text', align: 'center' },
+  { text: '样品名称', value: 'text', align: 'center' },
+  { text: '出厂编号', value: 'text', align: 'center' },
+  { text: '型号', value: 'text', align: 'center' },
+  { text: '检校类别', value: 'text', align: 'center' },
+  { text: '创建人', value: 'text', align: 'center' },
+  { text: '创建时间', value: 'text', align: 'center' },
+  { text: '备注', value: 'text', align: 'center' },
 ])
 // 搜索
 const searchList = () => {
@@ -119,18 +75,18 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    testCategory: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    ids: [],
-    trainEndTime: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 原始记录编号
+    ids: [], // 导出集合
+    trainEndTime: '', // 结束时间
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    trainStartTime: '', // 开始时间
+    testCategory: '', // 检测类别
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   fetchData(true)
@@ -151,7 +107,6 @@
 }
 // 关闭编辑
 const close = () => {
-  show.value = true
   fetchData(true)
 }
 // 点击编辑id和删除row类型
@@ -220,7 +175,7 @@
     printJSON(list.value, properties, '环境记录单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter(item => checkoutList.value.includes(item))
     printJSON(printList, properties, '环境记录单列表')
   }
   else {
@@ -230,135 +185,133 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.effectiveCompany"
-            placeholder="原始记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="样品名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="出厂编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="型号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.testCategory"
-            placeholder="请选择检测类别"
-            style="width: 195px;"
-            clearable
-          >
-            <el-option
-              v-for="item in testCategoryList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.director"
-            placeholder="创建人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/add')"
-            icon="icon-add"
-            title="新建"
-            type="primary"
-            @click="add"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/export')"
-            icon="icon-export"
-            title="导出"
-            type="primary"
-            @click="exportAll"
-          />
-          <icon-button
-            v-if="proxy.hasPerm('/measure/train/plan/print')"
-            icon="icon-print"
-            title="打印"
-            type="primary"
-            @click="printList"
-          />
-        </template>
-        <normal-table
-          :data="list"
-          :total="total"
-          :columns="columns"
-          :query="listQuery"
-          :list-loading="loadingTable"
-          is-showmulti-select
-          @change="changePage"
-          @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.effectiveCompany"
+          placeholder="原始记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="样品名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="出厂编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="型号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.testCategory"
+          placeholder="请选择检测类别"
+          style="width: 195px;"
+          clearable
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="190">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in testCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.director"
+          placeholder="创建人"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/add')"
+          icon="icon-add"
+          title="新建"
+          type="primary"
+          @click="add"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/export')"
+          icon="icon-export"
+          title="导出"
+          type="primary"
+          @click="exportAll"
+        />
+        <icon-button
+          v-if="proxy.hasPerm('/measure/train/plan/print')"
+          icon="icon-print"
+          title="打印"
+          type="primary"
+          @click="printList"
+        />
+      </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="190">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/plan/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/train/plan/delete')"
+                size="small"
+                link
+                type="danger"
+                @click="handleDelete(row.$index, row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 199fae2..3569f76 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="ReportOnCredentialsAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFileList, IFixedAssetsList, IFromListInfoType } from '../report_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
 import {
   getStandardLisAdd,
@@ -19,7 +19,6 @@
 import useUserStore from '@/store/modules/user'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -70,7 +69,7 @@
   createUser: '', // 创建人id
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfoType>({
   templateName: '', // 证书报告模板名称
   signName: '', // 电子签章名称
   approvalSignName: '', // 认可标准专用章
@@ -87,6 +86,7 @@
   customerLocation: '', // 委托方地址
   censorshipUser: '', // 送检人
   phone: '', // 送检人联系方式
+  taskId: '',
   expectedDeliveryTime: '', // 预计送达时间
   expectedCompletionTime: '', // 预计检完时间
   verificationItems: '', // 检定项目
@@ -104,40 +104,12 @@
   organizeName: string
   deptId: string
 }
-const checkTypeOptions = ref<IOptions[]>([])
-const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
-const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
-const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
-const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
-const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
-const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+interface standardOwnerOptionsType {
+  id: string
+  name: string
+}
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
-// 获取下拉框
-const getSelectList = (code: string) => {
-  getTypeSelect(code).then((res) => {
-    if (code === 'measureMajor') {
-      measureMajorList.value = res.data
-    }
-    else if (code === 'standardManagerState') {
-      standardManagerStateList.value = res.data
-    }
-    else if (code === 'standardLevel') {
-      standardLevelList.value = res.data
-    }
-    else if (code === 'transmitRange') {
-      transmitRangeList.value = res.data
-    }
-    else if (code === 'standardCategory') {
-      checkTypeOptions.value = res.data
-    }
-  })
-}
-getSelectList('measureMajor') // 获取计量专业下拉框
-getSelectList('standardManagerState') // 获取管理状态下拉框
-getSelectList('standardLevel') // 获取标准等级下拉框
-getSelectList('transmitRange') // 获取传递范围下拉框
-getSelectList('standardCategory') // 获取类别下拉框
 const approvalDialog = ref()
 const params = ref({
   director: '',
@@ -155,6 +127,7 @@
 getUsersDept(params.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
+const standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
 // 获取到标准负责人数组
 const getStandardOwnerOptions = () => {
   const params = {
@@ -173,8 +146,6 @@
 }
 // 数据
 const list = ref<object[]>([])
-// 标准配套设备更换表格总数
-const total = ref(0)
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -324,8 +295,10 @@
 })
 // 第几条数据选择
 const listIndex = ref(0)
-
-const uploadIndex = (row) => {
+interface IRowIndexType {
+  $index: number
+}
+const uploadIndex = (row: IRowIndexType) => {
   listIndex.value = row.$index
 }
 // 选择标准配套设备
@@ -354,14 +327,29 @@
   }
   else {
     fromListInfo.value.applyEquipmentList.push({
-      equipmentId: '',
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({
+      equipmentName: '', // 设备名称
+      equipmentNo: '', // 设备编号
+      modelNo: '', // 型号
+      mesureResult: '',
+      validDate: '', // 到期时间
+      id: '', // 主键
+      equipmentId: '', // 设备id
+      standardApplyId: '',
+    })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => {
+const equipmentAddRow = (data: IFixedAssetsList) => {
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -377,7 +365,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ choose: false, fileName: '' })
   }
 }
 // 点击文件预览
@@ -432,9 +420,8 @@
       }
     })
     formInline.value = res.data.meterStandardEquipment
-    fromListInfo.value.standardEquipmentId = res.data.id
     fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
       item.choose = true
       return item
     })
@@ -480,6 +467,7 @@
       break
   }
 }
+
 // 保存后的id
 const addId = ref('')
 // 点击顶部一排按钮
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
new file mode 100644
index 0000000..3dcb379
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -0,0 +1,54 @@
+export interface IFromListInfoType {
+  templateName: string // 证书报告模板名称
+  signName: string // 电子签章名称
+  approvalSignName: string // 认可标准专用章
+  originalRecordName: string // 原始记录名称
+  calibrationPlace: string // 校验地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  leaveNo: string // 出厂编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  customerPhone: string // 委托方电话
+  customerLocation: string // 委托方地址
+  censorshipUser: string // 送检人
+  phone: string // 送检人联系方式
+  expectedDeliveryTime: string // 预计送达时间
+  expectedCompletionTime: string // 预计检完时间
+  verificationItems: string // 检定项目
+  model: string // 型号
+  taskId: string
+  manufacturer: string // 生产厂家
+  applyEquipmentList: IApplyEquipmentList[]
+  fixedAssetsList: IFixedAssetsList[]
+  fileList: IFileList[]
+}
+
+export interface IApplyEquipmentList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFixedAssetsList {
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureResult: string
+  validDate: string // 到期时间
+  id: string // 主键
+  equipmentId: string // 设备id
+  standardApplyId: string
+}
+
+export interface IFileList {
+  fileName: string
+  choose: boolean
+}
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 5be4fa1..d440968 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -1,42 +1,144 @@
-export interface IlistQuery {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  logType?: string
-  offset: number
-  limit: number
-}
-export interface ISupplier {
-  checkDate: string
-  checkName: string
-  checkNo: string
-  checkPerson: string
-  checkResult: string
-  checkResultName: string
-  createTime: null | string
-  createUser: string
-  createUserName: string
-  fileList: [
-    {
-      checkId: string
-      createTime: null | string
-      createUser: string
-      fileName: string
-      id: string
-      isDel: null | string
-      minioFileName: string
-      remark: string
-      updateTime: string
-    },
-  ]
-  id: string
-  isDel: null | string
-  managerPoinLocation: string
-  remark: string
-  updateTime: null | string
-}
+// 设备检修保养审批列表list
+export interface IlistApproval {
+  checkDate: string // 检修时间
+  checkName: string // 检修名称
+  checkNo: string // 检修编号
+  checkPerson: string // 检修人
+  checkResult: string // 检修单位
+  checkResultName: string // 检修单位名称
+  createTime: null | string // 创建时间
+  createUser: string // 创建人
+  createUserName: string // 创建人名称
+  fileList: IfileListType[] // 文件列表
+  equipmentList?: [] // 设备列表
+  id: string // 主键
+  isDel: null | string // 删除id
+  taskId?: string // 任务id
+  processId?: string // 审批id
+  managerPoinLocation: string // 管理点位置
+  remark: string // 备注
+  updateTime: null | string // 更新时间
 
+}
+// 下拉框类型
 export interface IOptions {
   id: string
   name: string
 }
+// 设备检修保养验收单审批列表查询type
+export interface IlistApprovalTypes {
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  applyName: string // 审批名称
+  applyNo: string // 审批编号
+  applyType: string // 审批类型
+  businessKeys: [] // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo?: string // 检修申请编号
+  checkEndDate?: string // 检修结束时间
+  checkStartDate?: string // 检修开始时间
+  checkApplyName?: string
+  createUser: string //  创建人
+  applyPerson?: string
+  processResult?: string
+  applyUnit?: string
+  endTime?: string
+  startTime?: string
+  ids: string[] // 主键集合
+  overhaulPerson: string // 检修保养人
+  offset: number // 当前页
+  limit: number // 一页多少条
+}
+
+// 附件列表类型
+export interface IfileListType {
+  applyId: string // 申请id
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileName: string // 文件名
+  id: string // 主键
+  isDel: string // 删除id
+  minioFileName: string // minio存储文件名
+  remark: string // 备注
+  updateTime: string // 更新时间
+}
+
+// 设备保养验收单新增类型
+export interface IlistApprovalAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型-字典code
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态-字典code
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: [] // 设备详细列表
+  equipmentList: [] // 	设备列表
+  fileList: IfileListType[] // 附件列表
+  checkList?: [] // 后端返回设备文件
+  id: string // 主键
+  isDel: string // 删除标记
+  overhaulPerson: string // 检修保养人（设备检修保养验收申请）
+  processId: string // 流程实例ID
+  processResult: string // 处理结果（设备领用、借用处理结果）
+  remark: string // 备注
+  taskId: string // 任务id（同意、驳回等操作使用）
+  time: string // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+
+// 设备列表对象类型
+export interface returnRowType {
+  id?: string
+  equipmentId?: string
+}
+
+export interface IlistPageAddTypes {
+  acceptanceCheckId: string // 检修申请id
+  applyDesc: string // 申请说明
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 申请人
+  applyPersonName: string // 申请人姓名
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请单位
+  applyUnitName: string // 申请单位名称
+  approvalStatus: string // 审批状态
+  approvalStatusName: string // 审批状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentInfoList: returnRowType[] // 设备详情列表
+  equipmentList: returnRowType[] // 设备列表
+  id: string // 主键
+  isDel: string // 删除id
+  overhaulPerson: string
+  processId: string // 审批id
+  processResult: string
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string
+  updateTime: string // 更新时间
+  version: string // 版本号
+}
+// 设备管理查询条件类型
+export interface IManageChecklistQuery {
+  checkStartDate: string // 检查表开始时间
+  ids: string[] // 导出id集合
+  checkEndDate: string // 检查表结束时间
+  checkName: string // 检查表名称
+  checkNo: string // 检查表编号
+  offset: number // 当前页
+  limit: number // 当前页多少条
+}
+// 设备管理list类型
+export interface IManageChecklist {
+  id: string
+}
diff --git a/src/views/device/deviceMaintenance/components/applyList.vue b/src/views/device/deviceMaintenance/components/applyList.vue
index 45be74a..fe37e7b 100644
--- a/src/views/device/deviceMaintenance/components/applyList.vue
+++ b/src/views/device/deviceMaintenance/components/applyList.vue
@@ -25,7 +25,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index f3024cf..046fc31 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -6,6 +6,7 @@
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getEquipmentApplyList } from '@/api/device/checkList'
 import { SCHEDULE } from '@/utils/scheduleDict'
 const emits = defineEmits(['add'])
@@ -32,7 +33,7 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
     value: 'applyNo',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 398cfd5..cb6dad4 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import { deleteAcceptanceCheck, getacceptanceCheckList, submitAcceptanceCheck } from '@/api/device/checkList'
@@ -21,7 +21,6 @@
     default: () => [],
   },
 })
-const emit = defineEmits(['setData']) // 关闭
 
 // 获取权限
 const { proxy } = getCurrentInstance() as any
@@ -32,24 +31,24 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
-  applyName: '',
-  applyNo: '',
-  applyType: '9',
-  businessKeys: [],
-  checkApplyNo: '',
-  checkEndDate: '',
-  checkStartDate: '',
-  createUser: '',
-  ids: [],
-  overhaulPerson: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '9', // 审批类型
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  checkApplyNo: '', // 检修申请编号
+  checkEndDate: '', // 检修结束时间
+  checkStartDate: '', // 检修开始时间
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -129,15 +128,8 @@
 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) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -160,7 +152,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '取消',
@@ -197,20 +189,20 @@
 // 点击重置
 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,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '9', // 审批类型
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    checkApplyNo: '', // 检修申请编号
+    checkEndDate: '', // 检修结束时间
+    checkStartDate: '', // 检修开始时间
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -223,21 +215,6 @@
 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',
@@ -257,7 +234,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IlistApproval) => {
   $router.push(`maintenanceCheckList/detail/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -273,7 +250,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -304,7 +281,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -358,7 +335,7 @@
     printJSON(list.value, properties, '设备检修列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 9b78d7d..84e1126 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -1,11 +1,9 @@
-<script lang="ts" setup name="maintenanceAdd">
+<script lang="ts" setup name="ListApprovalAdd">
 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 type { IlistApprovalAddTypes } from '../checkList_interface'
 import checkList from './checkList.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { acceptanceCheckInfo, addAcceptanceCheck, equipmentApplyInfo, submitAcceptanceCheck, updateAcceptanceCheckInfo } from '@/api/device/checkList'
 import { UploadFile } from '@/api/measure/file'
 import { submitApproval } from '@/api/approval'
@@ -41,46 +39,46 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '9',
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
-  approvalStatus: '',
-  approvalStatusName: '',
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
+const formInline = ref<IlistApprovalAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '9', // 申请类型-字典code
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
+  approvalStatus: '', // 审批状态-字典code
+  approvalStatusName: '', // 审批状态名称
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详细列表
+  equipmentList: [], // 	设备列表
   fileList: [
     {
-      applyId: '',
-      createTime: '',
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: '',
-      minioFileName: '',
-      remark: '',
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
       updateTime: '',
-    },
-  ],
-  id: '',
-  isDel: '',
-  overhaulPerson: '',
-  processId: '',
-  processResult: '',
-  remark: '',
-  taskId: '',
-  time: '',
-  updateTime: '',
-  version: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除标记
+  overhaulPerson: '', // 检修保养人（设备检修保养验收申请）
+  processId: '', // 流程实例ID
+  processResult: '', // 处理结果（设备领用、借用处理结果）
+  remark: '', // 备注
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  time: '', // 领用时间/借用时间/闲置时间/封存时间/检修时间
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface checkIdObjectType {
@@ -155,8 +153,6 @@
 const selectPerson = () => {
   checkListRef.value.initDialog()
 }
-// 标准配套设备更换表格分页
-const changePage = () => {}
 
 // 添加表格数据对象
 const addList = ref({})
@@ -181,25 +177,6 @@
   overhaulPerson: [{ required: true, message: '检修保养人不能为空', trigger: ['blur', 'change'] }],
   time: [{ required: true, message: '检修时间不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
-// 审批流程
-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
@@ -224,28 +201,7 @@
     })
   }
 }
-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 = () => {
   acceptanceCheckInfo({ id: infoId.value }).then((res) => {
@@ -272,11 +228,6 @@
 const approvalSuccess = () => {
   getInfo()
 }
-// 提交
-const submitForm = () => {
-  return ruleFormRef.value
-}
-defineExpose({ submitForm })
 // 取消
 const handleCancel = () => {
   const params = {
@@ -336,6 +287,9 @@
             type: 'warning',
           },
         ).then(() => {
+          if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+            formInline.value.fileList = []
+          }
           addAcceptanceCheck(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 568a1b3..c229bde 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, 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 { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, IlistApproval, IlistApprovalTypes } from '../checkList_interface'
+import type { IButton } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDeptTree } from '@/api/system/plan'
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
@@ -32,25 +32,27 @@
 })
 
 // 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-  applyName: '',
-  applyNo: '',
+const listQuery = ref<IlistApprovalTypes>({
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+  applyName: '', // 审批名称
+  applyNo: '', // 审批编号
+  applyType: '8', // 审批类型
   applyPerson: '',
-  applyType: '8',
+  checkApplyName: '',
   applyUnit: '',
-  businessKeys: [],
-  createUser: '',
   endTime: '',
-  ids: [],
-  processResult: '',
   startTime: '',
-  offset: 1,
-  limit: 20,
+  processResult: '',
+  businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+  createUser: '', //  创建人
+  ids: [], // 主键集合
+  overhaulPerson: '', // 检修保养人
+  offset: 1, // 当前页
+  limit: 20, // 一页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IlistApproval[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -95,17 +97,8 @@
 ])
 // 初始化路由
 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 checkTime = ref('')
 const loadingTable = ref(false)
@@ -138,7 +131,7 @@
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IlistApproval) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -161,7 +154,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IlistApproval) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -198,21 +191,22 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.DEVICE_FIX_APPROVAL,
-    applyName: '',
-    applyNo: '',
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.DEVICE_FIX_APPROVAL, // 表单id
+    applyName: '', // 审批名称
+    applyNo: '', // 审批编号
+    applyType: '8', // 审批类型
     applyPerson: '',
-    applyType: '7',
     applyUnit: '',
-    businessKeys: [],
-    createUser: '',
     endTime: '',
-    ids: [],
-    processResult: '',
     startTime: '',
-    offset: 1,
-    limit: 20,
+    processResult: '',
+    businessKeys: [], // 业务主键列表（工作流查询用，不用前端传）
+    createUser: '', //  创建人
+    ids: [], // 主键集合
+    overhaulPerson: '', // 检修保养人
+    offset: 1, // 当前页
+    limit: 20, // 一页多少条
   }
   checkTime.value = ''
   fetchData(true)
@@ -225,21 +219,7 @@
 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',
@@ -259,7 +239,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier, type: string) => {
+const goDetail = (row: IlistApproval, type: string) => {
   $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
 }
 // 获取到组织信息
@@ -275,7 +255,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IlistApproval) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -306,7 +286,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IlistApproval, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row, 'detail')
@@ -360,7 +340,7 @@
     printJSON(list.value, properties, '设备检修保养验收单列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IlistApproval) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '设备检修保养验收单列表')
   }
   else {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index d24d792..3b6771f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
+import type { IlistPageAddTypes, returnRowType } from '../checkList_interface'
 import { addEquipmentApply, equipmentApplyInfo, submitEquipmentApply, updateEquipmentApply } from '@/api/device/checkList'
 import { getDeptTreeList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -41,33 +42,33 @@
 const useDeptList = ref<deptType[]>([]) // 使用部门列表
 const usePersonList = ref<userType[]>([]) // 使用人列表
 // 逻辑代码
-const formInline = ref({
-  acceptanceCheckId: '',
-  applyDesc: '',
-  applyName: '',
-  applyNo: '',
-  applyPerson: '',
-  applyPersonName: '',
-  applyType: '8', //
-  applyTypeName: '',
-  applyUnit: '',
-  applyUnitName: '',
+const formInline = ref<IlistPageAddTypes>({
+  acceptanceCheckId: '', // 检修申请id
+  applyDesc: '', // 申请说明
+  applyName: '', // 申请名称
+  applyNo: '', // 申请编号
+  applyPerson: '', // 申请人
+  applyPersonName: '', // 申请人姓名
+  applyType: '8', // 申请类型
+  applyTypeName: '', // 申请类型名称
+  applyUnit: '', // 申请单位
+  applyUnitName: '', // 申请单位名称
   approvalStatus: '', // 审批状态
   approvalStatusName: '', // 审批状态名称
-  createTime: '',
-  createUser: '',
-  equipmentInfoList: [],
-  equipmentList: [],
-  id: null, // 主键
-  isDel: null,
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  equipmentInfoList: [], // 设备详情列表
+  equipmentList: [], // 设备列表
+  id: '', // 主键
+  isDel: '', // 删除id
   overhaulPerson: '',
   processId: '', // 审批id
   processResult: '',
-  remark: '',
-  taskId: '',
+  remark: '', // 备注
+  taskId: '', // 任务id
   time: '',
   updateTime: '', // 更新时间
-  version: '',
+  version: '', // 版本号
 })
 // 审批弹窗信息收集类型
 interface ListType {
@@ -360,13 +361,10 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 设备列表对象类型
-interface returnRowType {
-  id: string
-}
+
 // 设备列表添加
-const addRowMethods = (row: Array) => {
-  row.forEach((item: returnRowType, index: string) => {
+const addRowMethods = (row: returnRowType[]) => {
+  row.forEach((item: returnRowType, index: number) => {
     formInline.value.equipmentList.push({ equipmentId: item.id })
   })
   // 设备状态
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 15bd42d..1b9ed05 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -5,7 +5,7 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
-import type { ISupplier } from '../checkList_interface'
+import type { IlistApproval } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
@@ -31,34 +31,34 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<ISupplier> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  checkPerson: '',
-  checkResult: '',
-  checkResultName: '',
-  createTime: null,
-  createUser: userInfo.id,
-  createUserName: userInfo.username,
+const formInline = ref<IlistApproval>({
+  checkDate: '', // 检修时间
+  checkName: '', // 检修名称
+  checkNo: '', // 检修编号
+  checkPerson: '', // 检修人
+  checkResult: '', // 检修单位
+  checkResultName: '', // 检修单位名称
+  createTime: '', // 创建时间
+  createUser: userInfo.id, // 创建人
+  createUserName: userInfo.username, // 创建人名称
   fileList: [
     {
-      checkId: '',
-      createTime: null,
-      createUser: '',
-      fileName: '',
-      id: '',
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: null,
-    },
-  ],
-  id: '',
-  isDel: null,
-  managerPoinLocation: '',
-  remark: '',
-  updateTime: null,
+      applyId: '', // 申请id
+      createTime: '', // 创建时间
+      createUser: '', // 创建人
+      fileName: '', // 文件名
+      id: '', // 主键
+      isDel: '', // 删除id
+      minioFileName: '', // minio存储文件名
+      remark: '', // 备注
+      updateTime: '',
+    }, // 更新时间
+  ], // 附件列表
+  id: '', // 主键
+  isDel: '', // 删除id
+  managerPoinLocation: '', // 管理点位置
+  remark: '', // 备注
+  updateTime: '', // 更新时间
 })
 const checkResultList = ref([
   { id: '1', name: '优', value: '1' },
@@ -66,8 +66,7 @@
   { id: '3', name: '中', value: '3' },
   { id: '4', name: '差', value: '4' },
 ])
-const companyAddress = ref<string[]>([]) // 公司地址
-const invoiceAddress = ref<string[]>([]) // 开票地址
+// 校验ref
 const ruleFormRef = ref<FormInstance>()
 // 校验规则
 const rules = ref({
@@ -94,8 +93,8 @@
 // 打印表单
 const printObj = ref({
   id: 'form', // 需要打印元素的id
-  popTitle: '溯源供方详情', // 打印配置页上方的标题
-  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>溯源供方详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备管理点检查表', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备管理点检查表</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -116,6 +115,9 @@
         },
       ).then(() => {
         if (pageType.value === 'add') {
+          // if (formInline.value.fileList.length === 1 && formInline.value.fileList[0].minioFileName === '') {
+          //   formInline.value.fileList = []
+          // }
           getAddCheckInfo(formInline.value).then((res) => {
             if (res.code === 200) {
               close()
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 1d1058e..467d5cd 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -2,26 +2,27 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { ISupplier, IlistQuery } from './checkList_interface'
+import type { IManageChecklist, IManageChecklistQuery } from './checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportSourceList, getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { getDeleteCheckInfo, getExportCheckInfoList, getcheckInfoList } from '@/api/device/checkList'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 // 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  checkDate: '',
-  checkName: '',
-  checkNo: '',
-  offset: 1,
-  limit: 20,
+const listQuery: Ref<IManageChecklistQuery> = ref({
+  checkStartDate: '', // 检查表开始时间
+  ids: [], // 导出id集合
+  checkEndDate: '', // 检查表结束时间
+  checkName: '', // 检查表名称
+  checkNo: '', // 检查表编号
+  offset: 1, // 当前页
+  limit: 20, // 当前页多少条
 })
 // 控制是否显示新增页面
 const show = ref(true)
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IManageChecklist[]>([])
 // 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
@@ -61,17 +62,12 @@
     align: 'center',
   },
 ])
-
+// 检查开始时间和结束时间
+const checkDate = ref('')
 // 选中的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<IManageChecklist[]>([])
 // 文件上传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
@@ -79,6 +75,8 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.checkStartDate = checkDate.value[0] || ''
+  listQuery.value.checkEndDate = checkDate.value[1] || ''
   getcheckInfoList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = response.data.total
@@ -127,18 +125,18 @@
 const searchList = () => {
   fetchData(true)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    checkDate: '',
-    checkName: '',
-    checkNo: '',
-    offset: 1,
-    limit: 20,
+    checkStartDate: '', // 检查表开始时间
+    ids: [], // 导出id集合
+    checkEndDate: '', // 检查表结束时间
+    checkName: '', // 检查表名称
+    checkNo: '', // 检查表编号
+    offset: 1, // 当前页
+    limit: 20, // 当前页多少条
   }
+  checkDate.value = ''
   fetchData(true)
 }
 
@@ -214,7 +212,7 @@
     printJSON(list.value, properties, '设备管理点检查列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IManageChecklist) => checkoutList.value.includes(item))
     printJSON(printList, properties, '设备管理点检查列表')
   }
   else {
@@ -246,11 +244,13 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="listQuery.checkDate"
-            type="datetime"
-            placeholder="检查日期"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            v-model="checkDate"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            start-placeholder="检查日期开始时间"
+            end-placeholder="检查日期结束时间"
           />
         </search-item>
       </search-area>
@@ -295,10 +295,3 @@
     </app-container>
   </div>
 </template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index be35c51..6279c49 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,8 +2,7 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
-import ListSourceAdd from './listPageAdd.vue'
+import type { IOptions, Ibuttons, IlistQuery } from '../../standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
@@ -128,8 +127,12 @@
 const buttonArray = ref<string[]>([])
 // 部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 导出id类型
+interface ICheckoutList {
+  id: string
+}
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<ICheckoutList[]>([])
 // 文件上传input
 const fileRef = ref()
 // 审批弹窗开关
@@ -312,18 +315,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    applyNo: '',
-    applyStatus: '',
-    applyType: props.applyType,
-    approvalStatus: props.approvalStatus,
-    formId: props.schedule,
-    createUser: '',
-    equipmentNo: '',
+    applyNo: '', // 申请编号
+    applyStatus: '', // 申请状态
+    applyType: props.applyType, // 申请类型
+    approvalStatus: props.approvalStatus, // 审批状态
+    createUser: '', // 用户
+    equipmentNo: '', // 设备编号
     organizeNo: '',
-    standardName: '',
-    standardNo: '',
-    limit: 20,
-    offset: 1,
+    formId: props.schedule, // 表单id
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    limit: 20, // 一页多少条
+    offset: 1, // 第几页
   }
   fetchData(true)
 }
@@ -378,10 +381,7 @@
 const exportAll = () => {
   exportExcelBtn()
 }
-// 导出id类型
-interface ISupplier {
-  id: never
-}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -395,7 +395,7 @@
     printJSON(list.value, properties, '标准装置申请列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item))
+    const printList = list.value.filter((item: ICheckoutList) => checkoutList.value.includes(item))
     printJSON(printList, properties, '标准装置申请列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 521b80e..e9ad833 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup name="standardListAdd">
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { FormInstance, UploadRequestOptions, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
+import type { IFixedAssetsList, IFromListInfo, IformInline } from '../../standard_interface'
 import EquipmentDialog from '../standardList/equipmentDialog.vue'
 import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
@@ -52,7 +53,7 @@
 }
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
-const formInline = ref({
+const formInline = ref<IformInline>({
   assessDate: '', // 考核日期
   assessmentUnit: '', // 考核单位
   category: '', // 类 别
@@ -92,7 +93,7 @@
   uncertainty: '', // 不确定度
 })
 
-const fromListInfo = ref({
+const fromListInfo = ref<IFromListInfo>({
   applyDept: '', // 申请部门
   applyNo: '', // 申请编号
   applyType: $route.query.applyType, // 申请类型
@@ -385,7 +386,8 @@
   listIndex.value = row.$index
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile = (file: any) => {
+const uploadQuarterlyEvaluateFile = (file: UploadRequestOptions) => {
+  console.log(file)
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
@@ -427,11 +429,11 @@
       equipmentId: '',
       standardApplyId: '',
     })
-    fromListInfo.value.fixedAssetsList.push({})
+    fromListInfo.value.fixedAssetsList.push({ id: '' })
   }
 }
 // 选择设备之后
-const equipmentAddRow = (data: object) => { // 类型标注
+const equipmentAddRow = (data: IFixedAssetsList) => { // 类型标注
   fromListInfo.value.fixedAssetsList[listIndex.value] = data
   fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
   fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
@@ -447,7 +449,7 @@
     ElMessage.warning('请完善上一条文件信息')
   }
   else {
-    fromListInfo.value.fileList.push({ choose: false })
+    fromListInfo.value.fileList.push({ minioFileName: '', choose: false })
   }
 }
 // 点击文件预览
@@ -602,25 +604,6 @@
     clickBtn(item)
   }
 }
-// 审批流程模拟数据
-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 = () => {}
 // 选择标准装置弹窗ref
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index d612517..0352e2a 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,7 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IOptions } from '../../standard_interface'
+import type { IOptions, IStandardList } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -11,7 +11,7 @@
 import { UploadFile } from '@/api/measure/file'
 import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
-  infoId: {
+  infoId: { // 详情id
     type: String,
     default: '0',
   },
@@ -24,46 +24,46 @@
 const ruleFormRef = ref<FormInstance>()
 // 逻辑代码
 const formInline = ref({
-  assessDate: '',
-  assessmentUnit: '',
-  category: '',
-  categoryName: '',
-  constructionStandardProject: '',
-  constructionStandardUnitName: '',
-  contactInfo: '',
-  createTime: null,
-  createUser: null,
-  id: '',
-  isDel: null,
-  laboratoryOwner: '',
-  laboratoryOwnerContact: '',
-  laboratoryOwnerName: null,
-  managerState: '',
-  managerStateName: '',
-  measureMajor: '',
-  fileList: [],
-  measureMajorName: '',
-  mesureRange: '',
-  organizeNo: '',
-  preparationDate: '',
-  projectNo: '',
-  remark: '',
-  standardHumidity: null,
-  standardLaboratory: '',
-  standardLaboratoryName: '',
-  standardLevel: '',
-  standardLevelName: '',
-  standardName: '',
-  standardNo: '',
-  standardOwner: '',
-  standardOwnerName: '',
-  standardTemperature: null,
-  totalInvestment: null,
-  transmitRange: '',
-  transmitRangeName: '',
-  uncertainty: '',
-  updateTime: null,
-  version: null,
+  assessDate: '', // 考核日期
+  assessmentUnit: '', // 考核单位
+  category: '', // 类别
+  categoryName: '', // 类别名称
+  constructionStandardProject: '', // 建标项目
+  constructionStandardUnitName: '', // 建标单位名称
+  contactInfo: '', // 联系方式
+  createTime: '', // 创建时间
+  createUser: '', // 创建人
+  id: '', // 主键
+  isDel: '', // 删除标记
+  laboratoryOwner: '', // 实验室负责人
+  laboratoryOwnerContact: '', // 联系方式
+  laboratoryOwnerName: '', // 实验室负责人名字
+  managerState: '', // 管理状态
+  managerStateName: '', // 管理状态名称
+  measureMajor: '', // 计量专业
+  fileList: [], // 文件列表
+  measureMajorName: '', // 计量专业名称
+  mesureRange: '', // 测量范围
+  organizeNo: '', // 组织机构代码
+  preparationDate: '', // 筹建日期
+  projectNo: '', // 项目编号
+  remark: '', // 备注
+  standardHumidity: '', // 标准湿度
+  standardLaboratory: '', // 标准所在实验室
+  standardLaboratoryName: '', // 标准所在实验室名称
+  standardLevel: '', // 标准等级
+  standardLevelName: '', // 标准等级名称
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  standardOwner: '', // 标准负责人
+  standardOwnerName: '', // 标准负责人名称
+  standardTemperature: '', // 标准温度
+  totalInvestment: '', // 投资总额
+  transmitRange: '', // 传递范围
+  transmitRangeName: '', // 传递范围名称
+  uncertainty: '', // 不确定度
+  updateTime: '', // 更新时间
+  version: '', // 版本号
 })
 const checkTypeOptions = ref<IOptions[]>([])
 const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6bda8e3..2f4da9c 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -5,6 +5,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 // import type { TreeStructure } from '@/views/system/user/user-interface'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
@@ -28,12 +29,14 @@
 const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = [
-  { text: '文件名称', value: 'fileName' },
-  { text: '文件编号', value: 'fileNo' },
-  { text: '文件号', value: 'fileCode', align: 'center' },
-  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
-  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
+const columns = ref<TableColumn[]>(
+  [
+    { text: '文件名称', value: 'fileName' },
+    { text: '文件编号', value: 'fileNo' },
+    { text: '文件号', value: 'fileCode', align: 'center' },
+    { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+    { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }],
+)
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 59f7d87..016c289 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -1,21 +1,15 @@
 <script lang="ts" setup name="standardListAdd">
 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 type { corollaryEquipmentType, measurementPersonnelType, regulationVerificationType } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
 import userListDialog from './standardList/userListDialog.vue'
 import SelectDeviceDialog from './standardList/equipmentDialog.vue'
 import VerificationDialog from './standardList/verificationDialog.vue'
-import { getStaffList } from '@/api/measure/person'
-import { getTypeSelect } from '@/api/system/price'
 import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
-import { UploadFile } from '@/api/measure/file'
-const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -29,8 +23,13 @@
     infoId.value = $route.params.id as string
   }
 }
+interface formInlineType {
+  id: string
+}
 // 定义数据
-const formInline = ref({})
+const formInline = ref<formInlineType>({
+  id: '',
+})
 // 关闭
 interface menuType {
   name: string
@@ -62,7 +61,7 @@
   $router.back()
 }
 // 拿到formInline的数据
-const setData = (newValue: object) => {
+const setData = (newValue: formInlineType) => {
   formInline.value = newValue
 }
 const queryParams = {
@@ -82,8 +81,18 @@
 interface checkedRecord {
   text: string
 }
+// 设备item类型
+interface equipmentListPageItem {
+  name: string
+  equipmentName: string
+}
+// 文件item类型
+interface regulationListPageItem {
+  name: string
+  fileName: string
+}
 // 计量人员表头
-const measurementPersonnelColumns = ref([
+const measurementPersonnelColumns = ref<TableColumn[]>([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
   { text: '工作部门', value: 'deptId', align: 'center' },
@@ -92,7 +101,7 @@
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
 // 计量人员数据
-const measurementPersonnel = ref<checkedRecord[]>([])
+const measurementPersonnel = ref<measurementPersonnelType[]>([])
 // 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
 // 计量人员发送请求获取数据
@@ -116,14 +125,14 @@
   { text: '有效日期', value: 'validDate', align: 'center' },
 ])
 // 标准配套设备数据
-const corollaryEquipment = ref<checkedRecord[]>([])
+const corollaryEquipment = ref<corollaryEquipmentType[]>([])
 // 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
 // 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
   getEquipmentListPage({ id: infoId.value }).then((res) => {
-    corollaryEquipment.value = res.data.rows.map((item) => {
+    corollaryEquipment.value = res.data.rows.map((item: equipmentListPageItem) => {
       item.name = item.equipmentName
       return item
     })
@@ -139,12 +148,12 @@
   { text: '实施时间', value: 'effectiveTime', align: 'center' },
   { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
-const regulationVerification = ref<checkedRecord[]>([])
+const regulationVerification = ref<regulationVerificationType[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
   getRegulationListPage({ id: infoId.value }).then((res) => {
-    regulationVerification.value = res.data.rows.map((item) => {
+    regulationVerification.value = res.data.rows.map((item: regulationListPageItem) => {
       item.name = item.fileName
       return item
     })
@@ -247,7 +256,7 @@
     ElMessage.warning('请先完善上一条计量人员信息')
   }
   else {
-    measurementPersonnel.value.push({})
+    measurementPersonnel.value.push({ name: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -257,7 +266,7 @@
     ElMessage.warning('请先完善上一条配套设备信息')
   }
   else {
-    corollaryEquipment.value.push({})
+    corollaryEquipment.value.push({ name: '', equipmentName: '', standardEquipmentId: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -267,7 +276,7 @@
     ElMessage.warning('请先完善上一条检定规程信息')
   }
   else {
-    regulationVerification.value.push({})
+    regulationVerification.value.push({ name: '', standardEquipmentId: '', fileName: '' })
   }
   // ElMessage.warning('请先选择上一条信息')
 }
@@ -360,7 +369,7 @@
   }
 }
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: measurementPersonnelType) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
@@ -374,7 +383,7 @@
   }
 }
 // 选择完设备后
-const selectDeviceList = (data: object) => {
+const selectDeviceList = (data: corollaryEquipmentType) => {
   if (!corollaryEquipment.value.includes(data)) {
     corollaryEquipment.value[listIndex.value] = data
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
@@ -389,7 +398,7 @@
   }
 }
 // 检定规程选择完成后
-const verificationList = (data: object) => {
+const verificationList = (data: regulationVerificationType) => {
   if (!regulationVerification.value.includes(data)) {
     regulationVerification.value[listIndex.value] = data
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 71a829b..0b89689 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index c6a4885..9122307 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -2,7 +2,7 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, ISupplier, IlistQuerys } from './standard_interface'
+import type { IOptions, IStandardList, IlistQuerys } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
@@ -25,7 +25,7 @@
 })
 // 筹建日期
 const preparationDate = ref('')
-const list = ref<ISupplier[]>([]) // 存放数据
+const list = ref<IStandardList[]>([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
@@ -89,7 +89,7 @@
 // 表格loding
 const loadingTable = ref(false)
 // 选中的数据
-const checkoutList = ref([])
+const checkoutList = ref<IStandardList[]>([])
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -195,7 +195,7 @@
     printJSON(list.value, properties, '标准装置列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item)) // checkoutList类型
+    const printList = list.value.filter((item: IStandardList) => checkoutList.value.includes(item)) // checkoutList类型
     printJSON(printList, properties, '标准装置列表')
   }
   else {
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index e715195..11a7fe4 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,135 +1,215 @@
-// 标准装置列表以及提醒数据类型
-export interface IlistType {
-  standardNo: string
-  standardName: string
-  categoryName: string
-  standardLevel: string
-  transmitRange: string
-  managerStateName: string
-  standardLaboratoryName: string
-  standardOwnerName: string
-  preparationDate: string
-  remark: string
-}
+import type { LocationQueryValue } from 'vue-router'
 
-// list数据类型
-export interface ISupplier {
-  assessDate: string
-  assessmentUnit: string
-  category: string
-  categoryName: string
-  constructionStandardProject: string
-  constructionStandardUnitName: string
-  contactInfo: string
-  createTime: string
-  createUser: string
-  fileList: string
-  id: string
-  isDel: number
-  laboratoryOwner: string
-  laboratoryOwnerContact: string
-  laboratoryOwnerName: string
-  managerState: string
-  managerStateName: string
-  measureMajor: string
-  measureMajorName: string
-  mesureRange: string
-  organizeNo: string
-  preparationDate: string
-  projectNo: string
-  remark: string
-  remindTime: string
-  standardHumidity: string
-  standardLaboratory: string
-  standardLaboratoryName: string
-  standardLevel: string
-  standardLevelName: string
-  standardName: string
-  standardNo: string
-  standardOwner: string
-  standardOwnerName: string
-  standardTemperature: string
-  totalInvestment: string
-  transmitRange: string
-  transmitRangeName: string
-  uncertainty: string
-  updateTime: string
-  validTime: string
-  version: string
+// 标准装置list数据类型
+export interface IStandardList {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类别
+  categoryName: string // 类别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  fileList: string | []// 文件列表
+  id: string // 主键
+  isDel: string | number // 删除标记
+  laboratoryOwner: string // 实验室负责人
+  laboratoryOwnerContact: string // 联系方式
+  laboratoryOwnerName: string // 实验室负责人名字
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  remindTime: string // 提醒时间
+  standardHumidity: string // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: string // 标准温度
+  totalInvestment: string // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+  updateTime: string // 更新时间
+  validTime: string // 有效时间
+  version: string // 版本号
 }
 
 // 查询条件类型
 export interface IlistQuery {
-  applyNo: string
-  applyStatus: string
-  applyType: string
-  approvalStatus: string
-  createUser: string
-  equipmentNo: string
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyType: string // 申请类型
+  approvalStatus: string // 审批状态
+  createUser: string // 用户
+  equipmentNo: string // 设备编号
   organizeNo: string
-  formId: string
-  standardName: string
-  standardNo: string
-  limit: number
-  offset: number
+  formId: string // 表单id
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  limit: number // 一页多少条
+  offset: number // 第几页
 }
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  category: string
+  category: string // 类别
   id: string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
-}
-// 申请表格数据类型
-export interface IlistTypes {
-  applyNo: string
-  applyTypeName: string
-  standardNo: string
-  standardName: string
-  constructionStandardUnitName: string
-  standardOwner: string
-  applyDept: string
-  createUser: string
-  createTime: string
-  approvalStatusName: string
+  managerState: string // 管理状态
+  preparationEndDate: string // 筹建日期结束
+  preparationStartDate: string // 筹建日期开始
+  standardLaboratory: string // 标准所在实验室
+  standardName: string // 标准名称
+  standardNo: string // 标准代码
+  validEndTime: string // 到期结束时间
+  validStartTime: string // 到期开始时间
+  offset: number // 多少页
+  limit: number // 一页多少条
 }
 
 // 下拉框类型
 export interface IOptions {
-  name: string
-  id: string
-  value: string
-  organizeName: string
-  deptId?: string
+  name: string // 名称
+  id: string // id
+  value: string // 值
+  organizeName: string // 设备名
+  deptId?: string // 部门
 }
 
 // 到期提醒列表查询条件类型
 export interface IexpiraListQuery {
-  category: string
-  id: null | string
-  managerState: string
-  preparationEndDate: string
-  preparationStartDate: string
-  standardLaboratory: string
-  standardName: string
-  standardNo: string
-  validEndTime: string
-  validStartTime: string
-  offset: number
-  limit: number
+  category: string // 类别
+  id: string // 主键id
+  managerState: string // 管理状态
+  preparationEndDate: string // 结束时间
+  preparationStartDate: string // 开始时间
+  standardLaboratory: string // 标准所在部门
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  validEndTime: string // 结束时间
+  validStartTime: string // 开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
 
 // 按钮类型
 export interface Ibuttons {
-  type: string
+  type: string // 按钮类型
+  name: string // 按钮名称
+}
+
+// 文件列表类型
+export interface IfileList {
+  minioFileName: string // 文件名
+  choose?: boolean // 底部是否显示文件名开关
+  fileName?: string
+}
+export interface IFixedAssetsList {
+  id: string
+}
+// 申请formInline类型
+export interface IformInline {
+  assessDate: string // 考核日期
+  assessmentUnit: string // 考核单位
+  category: string // 类 别
+  categoryName: string // 类 别名称
+  constructionStandardProject: string // 建标项目
+  constructionStandardUnitName: string // 建标单位名称
+  contactInfo: string // 联系方式
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  id: string // 主键id
+  laboratoryOwner: string // 实验室
+  laboratoryOwnerContact: string // 实验室负责人
+  laboratoryOwnerName: string // 实验室名称
+  managerState: string // 管理状态
+  managerStateName: string // 管理状态名称
+  measureMajor: string // 计量专业
+  fileList: IfileList[] // 文件列表
+  measureMajorName: string // 计量专业名称
+  mesureRange: string // 测量范围
+  organizeNo: string // 组织机构代码
+  preparationDate: string // 筹建日期
+  projectNo: string // 项目编号
+  remark: string // 备注
+  standardHumidity: null // 标准湿度
+  standardLaboratory: string // 标准所在实验室
+  standardLaboratoryName: string // 标准所在实验室名称
+  standardLevel: string // 标准等级
+  standardLevelName: string // 标准等级名称
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  standardOwnerName: string // 标准负责人名称
+  standardTemperature: null // 标准温度
+  totalInvestment: null // 投资总额
+  transmitRange: string // 传递范围
+  transmitRangeName: string // 传递范围名称
+  uncertainty: string // 不确定度
+}
+
+export interface IApplyEquipmentList {
+  equipmentId?: string
+  standardApplyId?: string
+  id?: string
+}
+
+// 计量人员列表item类型
+export interface measurementPersonnelType {
   name: string
+  standardEquipmentId: string
+  id?: string
+  userId?: string
+}
+// 标准配套设备数据类型
+export interface corollaryEquipmentType {
+  name: string
+  standardEquipmentId: string
+  equipmentId?: string
+  id?: string
+  equipmentName: string
+}
+
+// 检定规程数据类型
+export interface regulationVerificationType {
+  name: string
+  standardEquipmentId: string
+  verifyRegulationId?: string
+  fileName: string
+  id?: string
+}
+
+// 申请FromListInfo类型
+export interface IFromListInfo {
+  applyDept: string // 申请部门
+  applyNo: string // 申请编号
+  applyType: LocationQueryValue | LocationQueryValue[]// 申请类型
+  applyTypeName: string // 申请类型名称
+  approvalStatus: string // 审批状态
+  applyEquipmentList: IApplyEquipmentList[] // 申请设备列表
+  fixedAssetsList: IApplyEquipmentList[] // 申请设备上传列表
+  approvalStatusName: string // 审批状态名称
+  constructionStandardUnitName: string // 建标单位名称
+  createTime: null // 创建时间
+  createUser: null // 创建人
+  fileList: IfileList[] // 文件列表
+  id: string // 主键id
+  processId: string // 审批id
+  remark: string // 备注
+  standardEquipmentId: string // 标准装置id
+  standardName: string // 标准名称
+  standardNo: string // 标准编号
+  standardOwner: string // 标准负责人
+  taskId: string // 任务id
 }
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
new file mode 100644
index 0000000..0ef0e90
--- /dev/null
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -0,0 +1,27 @@
+// 设备闲置申请表格行
+export interface TableRow {
+  applyNo: string
+  applyPerson: string
+  applyType: string
+  applyTypeName: string
+  applyUnit: string
+  approvalStatus: string
+  approvalStatusName: string
+  createTime: string
+  createUser: string
+  equipmentName: string
+  equipmentNo: string
+  fileList: string
+  id: number
+  isDel: number
+  managerState: string
+  managerStateName: string
+  modelNo: string
+  processId: string
+  processResult: string
+  remark: string
+  taskId: string
+  time: string
+  updateTime: string
+  version: string
+}
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index e630e24..0bdbd3a 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,10 +1,13 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import approve from './approvalActionDialog.vue'
+// import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { TableRow } from './status-interface'
 import { getStatusList } from '@/api/device/stateManage'
 import { getDictByCode } from '@/api/system/dict'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
 const props = defineProps({
   name: {
     type: String,
@@ -24,8 +27,6 @@
   },
 })
 const $router = useRouter()
-// import { exportFile } from '@/utils/exportUtils'
-// const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   applyNo: '', // 申请编号
   applyStatus: '', // 申请状态
@@ -41,7 +42,7 @@
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -93,8 +94,8 @@
     align: 'center',
   },
 ]) // 表格
-const list = ref() // 表格数据
-const approveRef = ref()
+const list = ref([]) // 表格数据
+const approvalDialog = ref()
 const dialogVisible = ref<boolean>(false) // 添加组件的显示与隐藏
 // 获取数据列表
 const getList = () => {
@@ -116,22 +117,6 @@
   }).catch((_) => {
     loadingTable.value = false
   })
-
-  // list.value = [
-  //   {
-  //     applyNo: 'sbxz20230103',
-  //     applyTypeName: `${props.name.substring(2, 4)}申请`,
-  //     equipmentNo: 'device20230103',
-  //     equipmentName: '测试设备',
-  //     modelNo: 'CL001',
-  //     managerStateName: '在用',
-  //     applyUnit: '徐州分中心',
-  //     applyPerson: '超级管理员',
-  //     time: '2023-1-3 13:47',
-  //     approvalStatusName: '审批中',
-  //   },
-  // ]
-  // total.value = 1
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -144,7 +129,7 @@
   getList()
 }
 // 详情
-const detail = (row: any) => {
+const detail = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -159,12 +144,7 @@
   })
 }
 // 编辑
-const update = (row: any) => {
-  // dialogVisible.value = true
-  // addRef.value.initDialog({
-  //   title: '编辑',
-  //   ...row,
-  // })
+const update = (row: TableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -178,7 +158,7 @@
   })
 }
 // 删除
-const remove = (row: any) => {
+const remove = (row: TableRow) => {
   ElMessageBox.confirm(
     `确认删除${row.equipmentName}吗？`,
     '提示',
@@ -188,41 +168,21 @@
       type: 'warning',
     },
   )
-  // .then(() => {
-  //   assetsDeleteApi({ id: row.id as string }).then((res) => {
-  //     if (res.code === 200) {
-  //       ElMessage({
-  //         type: 'success',
-  //         message: '删除成功',
-  //       })
-  //       getList()
-  //     }
-  //   })
-  // })
 }
 // 同意
-const agree = (row: any) => {
-  console.log(approveRef.value)
-  approveRef.value.initDialog({
-    radio: '1',
-  })
+const agree = (row: TableRow) => {
+  approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: any) => {
-  approveRef.value.initDialog({
-    radio: '3',
-  })
+const reject = (row: TableRow) => {
+  approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: any) => {
-  approveRef.value.initDialog(
-    {
-      radio: '2',
-    },
-  )
+const refuse = (row: TableRow) => {
+  approvalDialog.value.initDialog('refuse', row.taskId)
 }
 // 取消
-const cancel = (rowrow: any) => {
+const cancel = (rowrow: TableRow) => {
   ElMessageBox.confirm(
     '确认取消吗？',
     '提示',
@@ -239,7 +199,6 @@
 }
 // 重置
 const reset = () => {
-  // searchQuery.equipmentCategory = ''
   getList()
 }
 // 模板下载
@@ -265,9 +224,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref([])
+const selectList = ref<TableRow[]>([])
 // 表格多选
-const multiSelect = (row) => {
+const multiSelect = (row: TableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -283,7 +242,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter(item => selectIds.includes(item.id))
+    const printList = list.value.filter((item: TableRow) => selectIds.includes(item.id))
     printJSON(printList, properties, props.name)
   }
   else {
@@ -297,42 +256,15 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-
-  // listExportApi({ ...searchQuery, limit: undefined, offset: undefined }).then((res) => {
-  // if (selectList.value.length) {
-  //   selectList.value.forEach((item) => {
-  //     searchQuery.ids?.push(item.id as string)
-  //   })
-  // }
-  //   exportFile(res.data, '固定资产列表')
-  //   loading.close()
-  // searchQuery.ids = []
-  // }).catch((_) => {
-  //   loading.close()
-  // })
 }
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
   // 原生上传
-  // console.log(event.target.files)
-  // 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])
-    // listImporttApi(fd).then((res) => {
-    //   if (res.code === 200) {
-    //     ElMessage.success('上传成功')
-    //   }
-    //   else {
-    //     ElMessage.error(res.message)
-    //   }
-    // })
   }
-//   }
-//   else {
-//     ElMessage.error('请上传pdf格式')
-//   }
 }
 // 批量导入
 const batchImport = () => {
@@ -343,9 +275,6 @@
   getList()
   dialogVisible.value = false
 }
-// onMounted(() => {
-//   getList()
-// })
 watch(() => props.type, (newValue) => {
   if (newValue === '0') {
     searchQuery.approvalStatus = ''
@@ -358,19 +287,12 @@
   immediate: true,
   deep: true,
 })
-// watch(() => props.applyType, (newVal) => {
-//   searchQuery.applyStatus = newVal
-//   getList()
-// }, {
-//   immediate: true,
-//   deep: true,
-// })
 </script>
 
 <template>
   <div>
     <!-- 审批操作组件 -->
-    <approve ref="approveRef" @reset-data="refreshDta" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 布局 -->
     <app-container>
       <!-- 筛选条件 -->
@@ -388,38 +310,21 @@
           <el-input placeholder="申请单位" clearable class="w-50 m-2" />
         </search-item>
         <search-item>
-          <el-select placeholder="申请状态" clearable>
-            <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" /> -->
-          </el-select>
+          <el-select placeholder="申请状态" clearable />
         </search-item>
       </search-area>
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <!-- <el-button type="primary" @click="batchImport">
-            批量导入
-          </el-button>
-          <el-button type="primary" @click="templateDownload">
-            模板下载
-          </el-button> -->
           <icon-button icon="icon-add" title="新建" @click="add" />
           <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
           <icon-button icon="icon-print" title="打印" @click="printList" />
-          <!-- <el-button type="primary" @click="add">
-            新建
-          </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
-            导出
-          </el-button>
-          <el-button v-print="printObj" type="primary">
-            打印
-          </el-button> -->
         </template>
         <!-- 表格区域 -->
         <normal-table
           id="print"
-          :data="list" :total="total" :columns="columns as any"
+          :data="list" :total="total" :columns="columns"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
           :list-loading="loadingTable"
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index 07cac5e..1d3449d 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -205,16 +205,20 @@
   }
   fetchData(true)
 }
+// 导入
 const upload = () => {
   fileRef.value.click()
 }
+// 批量导入
 const uploadAll = () => {
   upload()
 }
 
+// 点击新增
 const add = () => {
   $router.push('/price/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index a75febd..d0ab9f2 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -1,11 +1,10 @@
 export interface IlistQuery {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  logType?: string
+  supplierNo: string // 业务内容
+  supplierName: string // 溯源供方名称
+  businessContent: string // 溯源供方编号
+  formId: string
   offset: number
   limit: number
-  formId: string
 }
 
 export interface IlistType {
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 2c8199d..b81c859 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -2,12 +2,13 @@
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, IOptions, ISupplier, IlistApprovalQuery, IlistType } from '../plan_interface'
+import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
-import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
+import { exportPlanList, getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -29,18 +30,18 @@
 
 // 查询条件
 const listQuery: Ref<IlistApprovalQuery> = ref({
-  approvalStatus: props.status,
-  formId: SCHEDULE.TRAIN_APPROVAL,
-  createTime: '',
-  deptId: '',
-  director: '',
-  effectiveCompany: '',
-  trainTime: '',
-  offset: 1,
-  limit: 20,
+  approvalStatus: props.status, // 审批状态
+  formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  director: '', // 负责人
+  effectiveCompany: '', // 实施单位
+  trainTime: '', // 培训时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 // 表格数据
-const list = ref<ISupplier[]>([])
+const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
 // 控制审批操作弹窗的开关
@@ -50,49 +51,42 @@
   {
     text: '计划编号',
     value: 'planNo',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
     value: 'planName',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
     value: 'trainPerson',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
     text: '主管部门',
     value: 'deptName',
-    width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
     value: 'effectiveCompany',
-    width: '90',
     align: 'center',
   },
   {
@@ -103,13 +97,12 @@
   {
     text: '培训内容',
     value: 'trainContent',
-    width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
     value: 'createTime',
-    width: '90',
+    width: '180',
     align: 'center',
   },
   {
@@ -121,18 +114,12 @@
 ])
 // 初始化路由
 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) {
@@ -152,16 +139,8 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-  taskId: string
-  proxy: boolean
-}
-const buttonTypeMap = ref('')
 // 点击删除或者取消
-const handleDelete = (row: rowReturn) => {
+const handleDelete = (row: IPlanList) => {
   ElMessageBox.confirm(
     '确认删除所选记录吗？',
     '提示',
@@ -184,7 +163,7 @@
 }
 
 // 取消
-const handleCancel = (row: ISupplier) => {
+const handleCancel = (row: IPlanList) => {
   const params = {
     taskId: row.taskId!,
     comments: '',
@@ -208,68 +187,48 @@
       })
     })
 }
-
+// 审批组件ref
 const approvalDialog = ref()
 
 // 点击搜索
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    approvalStatus: props.status,
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    createTime: '',
-    deptId: '',
-    director: '',
-    effectiveCompany: '',
-    trainTime: '',
-    offset: 1,
-    limit: 20,
+    approvalStatus: props.status, // 审批状态
+    formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+    createTime: '', // 创建时间
+    deptId: '', // 部门id
+    director: '', // 负责人
+    effectiveCompany: '', // 实施单位
+    trainTime: '', // 培训时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   fetchData(true)
 }
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
-// 导出类型
-interface supplierExportQuery {
-  approvalStatus: string
-  businessContent: string
-  companyArea: string
-  companyCity: string
-  companyProvince: string
-  effectiveCompany: string
-  formId: string
-  supplierName: string
-  supplierNo: string
-}
 
 // 导出
 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)',
   })
+  if (list.value.length > 0) {
+    exportPlanList(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '培训计划列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
   loading.close()
 }
 
@@ -284,7 +243,7 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
+const goDetail = (row: IPlanList) => {
   $router.push(`trainPlanApprove/${props.status}/${row.id}`)
 }
 // 获取到组织信息
@@ -300,7 +259,7 @@
 }
 getDept()
 // 提交
-const approvalSubmit = (row: ISupplier) => {
+const approvalSubmit = (row: IPlanList) => {
   ElMessageBox.confirm('确认提交吗？', '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -331,7 +290,7 @@
 }
 
 // 点击数据后的操作按钮
-const clickBtn = (row: ISupplier, buttonType: string) => {
+const clickBtn = (row: IPlanList, buttonType: string) => {
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -381,7 +340,7 @@
     printJSON(list.value, properties, '培训计划审批列表')
   }
   else if (checkoutList.value.length > 0) {
-    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    const printList = list.value.filter((item: IPlanList) => checkoutList.value.includes(item.id))
     printJSON(printList, properties, '培训计划审批列表')
   }
   else {
@@ -417,19 +376,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index c0915bb..3a145fa 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -3,7 +3,7 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier } from '../plan_interface'
+import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
 import { submitApproval } from '@/api/approval'
@@ -29,7 +29,7 @@
   }
 }
 // 详情表单
-const dataForm = ref<ISupplier>({
+const dataForm = ref({
   deptId: '',
   deptName: '',
   director: '',
@@ -76,6 +76,7 @@
 }
 getInfo()
 
+// 底部表格
 const columns = [
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
@@ -90,25 +91,6 @@
   $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 approvalSuccess = () => {
   getInfo()
diff --git a/src/views/measure/train/components/userListDialog.vue b/src/views/measure/train/components/userListDialog.vue
index 4382302..a1d4bae 100644
--- a/src/views/measure/train/components/userListDialog.vue
+++ b/src/views/measure/train/components/userListDialog.vue
@@ -1,9 +1,6 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
-import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -13,8 +10,11 @@
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 
+interface lListItem {
+  name: string // 姓名
+}
 // 查询条件
-const listQuery = ref({
+const listQuery = ref<lListItem>({
   name: '', // 姓名
 })
 const loadingTable = ref<boolean>(false)
@@ -33,19 +33,12 @@
     text: '技术职称',
     value: 'remark',
   },
-  {
-    text: '签到时间',
-    value: 'signTime',
-  },
-  {
-    text: '考核结果',
-    value: 'examResult',
-  },
 ])
 const list = ref(props.list || [])
 // 搜索
+
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  list.value = props.list.filter((item: lListItem) => item.name === listQuery.value.name)
 }
 const changePage = (e: any) => {
   console.log(e)
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9b6a861..c573944 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -5,7 +5,6 @@
 import type { IOptions, IPlanList, lPlanistQuery } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -285,19 +284,12 @@
         />
       </search-item>
       <search-item>
-        <el-select
+        <dept-select
+          ref="deptSelect"
           v-model="listQuery.deptId"
-          clearable
-          placeholder="主管部门"
-          size="default"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+          placeholder="请选择主管部门"
+          :dept-show="true"
+        />
       </search-item>
       <search-item>
         <el-input
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index cbbb01d..d97b3b4 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -2,7 +2,7 @@
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import userListDialog from '../person/components/userListDialog.vue'
-import type { IOptions } from './plan_interface'
+import type { IaddPersonListType, IformInlineType } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import {
@@ -29,23 +29,23 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline = ref({
-  createTime: null,
-  deptId: '',
-  deptName: null,
-  director: '',
-  effectiveCompany: null,
-  id: '',
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: '',
+const formInline = ref<IformInlineType>({
+  createTime: '', // 创建时间
+  deptId: '', // 部门id
+  deptName: '', // 部门名称
+  director: '', // 负责人
+  effectiveCompany: '',
+  id: '', // 主键
+  planName: '', // 培训名称
+  planNo: '', // 培训编号
+  remark: '', // 备注
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainHour: '', // 培训学时
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训人员
+  trainStaffList: [], // 人员信息
+  trainTime: '', // 培训时间
 })
 const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
@@ -56,17 +56,17 @@
   { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
-const addPersonList = ref({
+const addPersonList = ref<IaddPersonListType>({
   company: '',
   examResult: '',
-  id: 0,
+  id: '',
   name: '',
   remark: '',
   signTime: '',
-  staffId: 0,
+  staffId: '',
   technologyJob: '',
 })
-const SelectionList = ref([])
+const SelectionList = ref<IaddPersonListType[]>([])
 // 校验规则
 const rules = ref({
   planNo: [{ required: true, message: '计划编号不能为空', trigger: ['blur', 'change'] }],
@@ -123,7 +123,7 @@
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
+    (item: IaddPersonListType) => {
       return !SelectionList.value.includes(item)
     },
   )
@@ -133,16 +133,12 @@
   SelectionList.value = e
 }
 // 负责人类型
-interface confirmPersonType {
-  name: string
-}
-// 负责人类型
 interface trainStaffListType {
   updateTime: string
   createTime: string
 }
 // 选择完负责人的函数
-const confirmPerson = (object: confirmPersonType) => {
+const confirmPerson = (object: IaddPersonListType) => {
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -151,7 +147,7 @@
   })
 }
 // 选完计量人员
-const confirmTrainPerson = (object: confirmPersonType) => {
+const confirmTrainPerson = (object: IaddPersonListType) => {
   formInline.value.trainStaffList[listIndex.value] = object
   formInline.value.trainStaffList[listIndex.value].staffId = object.id
 }
@@ -183,7 +179,7 @@
           }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
-          formInline.value.trainStaffList.map((item: trainStaffListType) => {
+          formInline.value.trainStaffList.map((item: IaddPersonListType) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -235,13 +231,20 @@
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-print="pageType === 'detail' ? printObj : ''"
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '打印' : '提交')
+            getAddList(ruleFormRef, '提交')
           "
         >
-          {{ pageType === 'detail' ? '打印' : '提交' }}
+          提交
+        </el-button>
+        <el-button
+          v-if="pageType === 'detail'"
+          v-print="printObj"
+          type="primary"
+        >
+          打印
         </el-button>
         <el-button
           type="primary"
@@ -327,6 +330,7 @@
               <dept-select
                 ref="deptSelect"
                 v-model="formInline.deptId"
+                :placeholder="pageType === 'detail' ? '无' : '请选择主管部门'"
                 :disabled="pageType === 'detail'"
                 :dept-show="true"
               />
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 9888dd5..7d5f791 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -1,33 +1,3 @@
-export interface IlistQuery {
-  deptId: string
-  effectiveCompany: string
-  director: string
-  offset: number
-  limit: number
-  formId: string
-  createEndTime: string
-  createStartTime: string
-  ids: []
-  trainEndTime: string
-  trainStartTime: string
-}
-
-export interface IlistType {
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
-}
-
 export interface lPlanistQuery {
   createEndTime: string // 创建结束时间
   createStartTime: string // 创建开始时间
@@ -42,88 +12,131 @@
   limit: number // 每页多少条
 }
 
-// 培训审批查询条件
-export interface IApprovallistQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
-  ids?: []
-}
 // 培训计划列表数据
 export interface IPlanList {
-  deptId: string
-  createTime: string
-  deptName: string
-  director: string
-  effectiveCompany: string
-  id: string
-  planName: string
-  planNo: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  processId: string
-  trainStaffList: [
-    {
-      company: string
-      examResult: string
-      id: number
-      name: string
-      remark: string
-      signTime: string
-      staffId: number
-      technologyJob: string
-    },
-  ]
-  taskId?: string
-  trainTime: string
+  deptId: string // 部门id
+  createTime: string // 创建时间
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  processId: string // 审批id
+  trainStaffList: IObject[] // 学员列表
+  taskId?: string // 任务id
+  trainTime: string // 培训时间
 }
-
+// 下拉框类型
 export interface IOptions {
-  id: string
-  name: string
-  planName: string
+  id: string // id
+  name: string // 名称
+  planName: string // 培训名称
 }
-
+// 培训计划审批列表查询条件
 export interface IlistApprovalQuery {
-  approvalStatus: string
-  formId: string
-  createTime: string
-  deptId: string
-  director: string
-  effectiveCompany: string
-  trainTime: string
-  offset: number
-  limit: number
+  approvalStatus: string // 审批状态
+  formId: string // 表单id
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  director: string // 负责人
+  effectiveCompany: string // 实施单位
+  trainTime: string // 培训时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
-export interface IlistTypes {
-  createTime: string
-  deptName: string
-  director: string
-  logNo: string
-  planName: string
-  trainName: string
-  remark: string
-  trainAddress: string
-  trainContent: string
-  trainHour: string
-  trainNumber: number
-  trainPerson: string
-  trainTime: string
+// 培训记录查询条件类型
+export interface ItrainLoglistQuery {
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
+  ids: string[] // id集合
+  logNo: string // 记录编号
+  trainEndTime: string // 培训结束时间
+  trainName: string // 培训名称
+  trainStartTime: string // 培训开始时间
+  offset: number // 当前页
+  limit: number // 每页多少条
 }
-
+// 审批每列的按钮
 export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
+  name: string // 按钮名字
+  type: '' | 'default' | 'primary' | 'danger' | 'text' | 'success' | 'warning' | 'info' // 按钮类型
+  permission?: string // 按钮权限
+}
+
+// 添加人员类型
+export interface IObject {
+  company: string // 单位名称
+  examResult: string // 考核结果
+  name: string // 学员名称
+  remark: string // 备注
+  signTime: string // 签到时间
+  technologyJob: string // 技术职称
+  planId: string // 培训id
+  staffId?: string // 任务id
+  isNameShow?: boolean
+  updateTime?: string
+  createTime?: string
+  id?: string
+}
+
+// 培训记录新增详情
+export interface ITrinLogFormInline {
+  improveMethod: string // 改进措施
+  logNo: string // 记录编号
+  preparer: string // 人员
+  problems: string // 存在问题
+  planId: string // 培训id
+  planNo: string // 培训计划编号
+  remark: string // 备注
+  id: string // 主键id
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainEffect: string // 培训效果
+  trainHour: string // 培训学时
+  trainName: string // 培训名称
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训对象
+  trainStaffList: IObject[] // 培训人员列表
+  trainTime: string // 培训时间
+}
+// 新增人员信息对象类型
+export interface IaddPersonListType {
+  company: string
+  examResult: string
+  id: string
+  name: string // 名称
+  remark: string
+  signTime: string
+  staffId: string
+  technologyJob: string
+  updateTime?: string // 更新时间
+  createTime?: string // 创建时间
+}
+
+export interface IformInlineType {
+  createTime: string // 创建时间
+  deptId: string // 部门id
+  deptName: string // 部门名称
+  director: string // 负责人
+  effectiveCompany: string
+  id: string // 主键
+  planName: string // 培训名称
+  planNo: string // 培训编号
+  remark: string // 备注
+  trainAddress: string // 培训地点
+  trainContent: string // 培训内容
+  trainHour: string // 培训学时
+  trainNumber: string // 培训人数
+  trainPerson: string // 培训人员
+  trainStaffList: IaddPersonListType[] // 人员信息
+  trainTime: string // 培训时间
 }
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index 37057f2..d623767 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -2,22 +2,22 @@
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import type { IlistQuerys, IlistTypes } from './plan_interface'
+import type { ItrainLoglistQuery } from './plan_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery = ref({
-  createEndTime: '',
-  createStartTime: '',
-  ids: [],
-  logNo: '',
-  trainEndTime: '',
-  trainName: '',
-  trainStartTime: '',
-  offset: 1,
-  limit: 20,
+const listQuery = ref<ItrainLoglistQuery>({
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
+  ids: [], // id集合
+  logNo: '', // 记录编号
+  trainEndTime: '', // 培训结束时间
+  trainName: '', // 培训名称
+  trainStartTime: '', // 培训开始时间
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
 })
 const checkoutList = ref<string[]>([])
 const list = ref([])
@@ -110,15 +110,15 @@
 // 重置
 const clearList = () => {
   listQuery.value = {
-    createEndTime: '',
-    createStartTime: '',
-    ids: [],
-    logNo: '',
-    trainEndTime: '',
-    trainName: '',
-    trainStartTime: '',
-    offset: 1,
-    limit: 20,
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
+    ids: [], // id集合
+    logNo: '', // 记录编号
+    trainEndTime: '', // 培训结束时间
+    trainName: '', // 培训名称
+    trainStartTime: '', // 培训开始时间
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
   }
   trainTime.value = ''
   createTime.value = ''
@@ -160,13 +160,15 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/train/trainLog/${pageType}/${row.id}`)
 }
-const handelClick = (text: string) => {}
+// 表格多选框
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+// 点击新增
 const add = () => {
   $router.push('/train/trainLog/add')
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -215,91 +217,82 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area :need-clear="true" @search="searchList" @clear="clearList">
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.logNo"
-            placeholder="培训记录编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.trainName"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <!-- <el-date-picker
-            v-model="listQuery.trainTime"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-          /> -->
-          <el-date-picker
-            v-model="trainTime"
-            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-item>
-          <el-date-picker
-            v-model="createTime"
-            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 v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+  <app-container>
+    <search-area :need-clear="true" @search="searchList" @clear="clearList">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.logNo"
+          placeholder="培训记录编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.trainName"
+          placeholder="实施单位"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="trainTime"
+          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-item>
+        <el-date-picker
+          v-model="createTime"
+          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 v-if="proxy.hasPerm('/measure/train/tarnLog/import')" icon="icon-import" title="批量导入" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/mould')" icon="icon-template" title="模板下载" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/measure/train/tarnLog/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </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="140">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/measure/train/tarnLog/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>
+            </template>
+          </el-table-column>
         </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="140">
-              <template #default="{ row }">
-                <el-button
-                  v-if="proxy.hasPerm('/measure/train/tarnLog/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>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
 
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 6301859..77ca707 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup name="planlogAdd">
 import type { FormInstance } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions } from './plan_interface'
+import type { IObject, IOptions, ITrinLogFormInline } from './plan_interface'
 import userListDialog from './components/userListDialog.vue'
 import PlanListDialog from './components/planListDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import useUserStore from '@/store/modules/user.ts'
+import useUserStore from '@/store/modules/user'
 import {
   getListDetail,
   getListLogAdd,
@@ -16,7 +16,6 @@
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -31,32 +30,35 @@
   }
 }
 const { name } = useUserStore()
+// 数据校验ref
 const ruleFormRef = ref<FormInstance>()
-const formInline = ref({
-  improveMethod: '',
-  logNo: '',
-  preparer: name || '',
-  problems: '',
-  planId: '',
-  remark: '',
-  id: '',
-  trainAddress: '',
-  trainContent: '',
-  trainEffect: '',
-  trainHour: '',
-  trainName: '',
-  trainNumber: '',
-  trainPerson: '',
-  trainStaffList: [],
-  trainTime: '',
+// 培训记录新增数据
+const formInline = ref<ITrinLogFormInline>({
+  improveMethod: '', // 改进措施
+  logNo: '', // 记录编号
+  preparer: name || '', // 人员
+  problems: '', // 存在问题
+  planId: '', // 培训id
+  planNo: '', // 培训计划编号
+  remark: '', // 备注
+  id: '', // 主键id
+  trainAddress: '', // 培训地点
+  trainContent: '', // 培训内容
+  trainEffect: '', // 培训效果
+  trainHour: '', // 培训学时
+  trainName: '', // 培训名称
+  trainNumber: '', // 培训人数
+  trainPerson: '', // 培训对象
+  trainStaffList: [], // 培训人员列表
+  trainTime: '', // 培训时间
 })
 // 主管部门下拉框
 const options = ref<IOptions[]>([])
 const dialogVisible = ref(false)
 // 下面列表用的
-const trainList = ref([])
+const trainList = ref<IObject[]>([])
+// 表头
 const columns = [
-  // { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company', required: true },
   { text: '技术职称', value: 'technologyJob', required: true },
   { text: '签到时间', value: 'signTime', required: true },
@@ -66,10 +68,12 @@
 const rules = ref({
   logNo: [{ required: true, message: '编号不能为空', trigger: ['blur', 'change'] }],
   preparer: [{ required: true, message: '填表人不能为空', trigger: ['blur', 'change'] }],
-  planId: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
+  planNo: [{ required: true, message: '计划编号必选', trigger: ['blur', 'change'] }],
   trainName: [{ required: true, message: '培训名称不能为空', trigger: ['blur', 'change'] }],
   trainPerson: [{ required: true, message: '培训对象不能为空', trigger: ['blur', 'change'] }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] }],
+  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: ['blur', 'change'] },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '湿度(%)只能为数字', trigger: ['blur', 'change'] },
+  ],
   trainHour: [{ required: true, message: '培训学时不能为空', trigger: ['blur', 'change'] }],
   trainTime: [{ required: true, message: '培训时间不能为空', trigger: ['blur', 'change'] }],
   trainAddress: [{ required: true, message: '培训地点不能为空', trigger: ['blur', 'change'] }],
@@ -79,17 +83,18 @@
   trainContent: [{ required: true, message: '培训内容不能为空', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 const userListRef = ref()
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  name: '',
-  remark: '',
-  signTime: '',
-  technologyJob: '',
-  planId: 0,
-  staffId: 0,
+// 新增学员对象
+const addPersonList = ref<IObject>({
+  company: '', // 单位名称
+  examResult: '', // 考核结果
+  name: '', // 学员名称
+  remark: '', // 备注
+  signTime: '', // 签到时间
+  technologyJob: '', // 技术职称
+  planId: '', // 培训id
+  staffId: '', // 任务id
 })
-const SelectionList = ref([])
+const SelectionList = ref<IObject[]>([])
 const ListDetail = ref([])
 // 控制是否显示输入框开关
 const isNameShow = ref(true)
@@ -99,22 +104,25 @@
 const close = () => {
   $router.back()
 }
-const addRoow = () => {
+// 新增行
+const addRow = () => {
   if (formInline.value.planId === '') {
     return ElMessage.warning('还未选择计划编号')
   }
-  const object = {
-    company: '',
-    examResult: '',
-    name: '',
-    remark: '',
-    signTime: '',
-    technologyJob: '',
-    planId: '',
-    staffId: '',
-    isNameShow: false,
-  }
-  trainList.value.push(object)
+  const object = ref<IObject>(
+    {
+      company: '', // 单位名称
+      examResult: '', // 考核结果
+      name: '', // 学员名称
+      remark: '', // 备注
+      signTime: '', // 签到时间
+      technologyJob: '', // 技术职称
+      planId: '', // 培训id
+      staffId: '', // 任务id
+      isNameShow: false,
+    },
+  )
+  trainList.value.push(object.value)
 }
 // 点击关闭
 const handleClose = () => {
@@ -133,11 +141,12 @@
 // 删除行
 const deleteList = () => {
   trainList.value = trainList.value.filter(
-    (item) => {
+    (item: IObject) => {
       return !SelectionList.value.includes(item)
     },
   )
 }
+// 下拉框
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
@@ -148,6 +157,7 @@
 const addPersonListChange = (e: string) => {
   addPersonList.value = ListDetail.value.filter((item: itemReturn) => item.staffId === e)[0]
 }
+// 只要有id就会获取详情
 if (infoId.value && infoId.value !== '') {
   getListLogDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
@@ -158,12 +168,14 @@
 interface rowReturn {
   isNameShow: boolean
   id: string
+  planNo: string
   planName: string
 }
 // 双击表格中默认显示的name
 const dblclickName = (row: rowReturn) => {
   row.isNameShow = true
 }
+// 提交按钮
 const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
@@ -187,7 +199,7 @@
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
           formInline.value.trainStaffList = trainList.value
-          formInline.value.trainStaffList.map((item) => {
+          formInline.value.trainStaffList.map((item: IObject) => {
             delete item.updateTime
             delete item.createTime
           })
@@ -199,21 +211,20 @@
             }
           })
         }
-        else {
-          // 打印
-          const printObj = ref({
-            id: 'print', // 需要打印元素的id
-            popTitle: '证书报告模板', // 打印配置页上方的标题
-            extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-            preview: false, // 是否启动预览模式，默认是false
-            standard: '',
-            extarCss: '',
-          })
-        }
       })
     }
   })
 }
+
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
 const listIndex = ref(0)
 // 选择人员
 const selectPerson = (index: number) => {
@@ -232,12 +243,12 @@
     ListDetail.value = res.data.trainStaffList
     res.data.preparer = name
     formInline.value = { ...res.data }
-    formInline.value.planId = data.id
+    formInline.value.planNo = data.planNo
     formInline.value.trainName = data.planName
   })
 }
 // 选择完负责人的函数
-const confirmPerson = (object: rowReturn) => {
+const confirmPerson = (object: IObject) => {
   if (!trainList.value.includes(object)) {
     trainList.value[listIndex.value] = object
     trainList.value[listIndex.value].staffId = object.id
@@ -299,9 +310,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planId">
+            <el-form-item label="计划编号:" prop="planNo">
               <el-input
-                v-model="formInline.planId"
+                v-model="formInline.planNo"
                 :placeholder="pageType === 'detail' ? '无' : '请选择计划编号'"
                 :disabled="pageType === 'detail'"
               >
@@ -361,8 +372,8 @@
                 v-model="formInline.trainTime"
                 type="datetime"
                 placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -441,7 +452,7 @@
         <el-button v-if="pageType !== 'detail'" type="info" :disabled="pageType === 'detail'" @click="deleteList">
           删除行
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRoow">
+        <el-button v-if="pageType !== 'detail'" type="primary" :disabled="pageType === 'detail'" @click="addRow">
           增加行
         </el-button>
       </template>
@@ -477,8 +488,8 @@
               v-model="scope.row[item.value]"
               type="datetime"
               :placeholder="`${item.text}`"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="pageType === 'detail'"
             />
             <el-input v-if="item.text !== '签到时间'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index ef78067..0f594af 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -48,9 +48,6 @@
   ruleForm.signDirector = ''
   ruleForm.id = ''
   dialogVisible.value = true
-  // ruleForm.noticePublisher = userInfo.$state.name
-  // ruleForm.noticeCompany = userInfo.$state.deptName
-  // ruleForm.noticeTime = dayjs().format('YYYY-MM-DD')
   if (row.title === '新增') {
     // 新增
     ruleFormRef.value?.resetFields()
@@ -158,46 +155,11 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
-      <!-- <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="签名编号" prop="signNo">
-            <el-input v-model.trim="ruleForm.signNo" placeholder="系统自动生成" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="签名名称" prop="signName">
-            <el-input v-model.trim="ruleForm.signName" placeholder="签名名称" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="创建时间" prop="noticeCompany">
-            <el-input v-model.trim="ruleForm.createTime" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="签名负责人" prop="signDirector">
-            <el-input v-model.trim="ruleForm.signDirector" placeholder="签名负责人" :disabled="title === '详情'" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="签名描述" prop="signDesc">
-        <el-input v-model.trim="ruleForm.signDesc" placeholder="签名描述" :disabled="title === '详情'" />
-      </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
-        <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
-          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="签名人员" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="发布内容" prop="noticeContent">
-        <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
-      </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">