diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
deleted file mode 100644
index 64e17e4..0000000
--- a/src/views/measure/train/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
deleted file mode 100644
index 64e17e4..0000000
--- a/src/views/measure/train/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
new file mode 100644
index 0000000..6e1cde3
--- /dev/null
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier } from '../plan_interface'
+import baseInfoDetail from './baseinfoDetail.vue'
+import { getListDetail } from '@/api/system/plan'
+import { submitApproval } from '@/api/approval'
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  deptId: '',
+  deptName: '',
+  director: '',
+  effectiveCompany: '',
+  planName: '',
+  planNo: '',
+  remark: '',
+  trainAddress: '',
+  trainContent: '',
+  trainHour: '',
+  trainNumber: 0,
+  trainPerson: '',
+  taskId: '',
+  trainStaffList: [
+    {
+      company: '',
+      examResult: '',
+      id: 0,
+      name: '',
+      remark: '',
+      signTime: '',
+      staffId: 0,
+      technologyJob: '',
+    },
+  ],
+  trainTime: '',
+})
+// 获取表单详情
+const getInfo = () => {
+  getListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    // if (dataForm.value.approvalStatus) {
+    //   // 待审批
+    //   if (dataForm.value.approvalStatus == '2') {
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
+    //     // todo：判断当前用户是否为发起人
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    // }
+  })
+}
+getInfo()
+
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime' },
+]
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="培训管理审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <base-info-detail :form-inline="dataForm" />
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="dataForm.trainStaffList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
deleted file mode 100644
index 64e17e4..0000000
--- a/src/views/measure/train/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
new file mode 100644
index 0000000..6e1cde3
--- /dev/null
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier } from '../plan_interface'
+import baseInfoDetail from './baseinfoDetail.vue'
+import { getListDetail } from '@/api/system/plan'
+import { submitApproval } from '@/api/approval'
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  deptId: '',
+  deptName: '',
+  director: '',
+  effectiveCompany: '',
+  planName: '',
+  planNo: '',
+  remark: '',
+  trainAddress: '',
+  trainContent: '',
+  trainHour: '',
+  trainNumber: 0,
+  trainPerson: '',
+  taskId: '',
+  trainStaffList: [
+    {
+      company: '',
+      examResult: '',
+      id: 0,
+      name: '',
+      remark: '',
+      signTime: '',
+      staffId: 0,
+      technologyJob: '',
+    },
+  ],
+  trainTime: '',
+})
+// 获取表单详情
+const getInfo = () => {
+  getListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    // if (dataForm.value.approvalStatus) {
+    //   // 待审批
+    //   if (dataForm.value.approvalStatus == '2') {
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
+    //     // todo：判断当前用户是否为发起人
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    // }
+  })
+}
+getInfo()
+
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime' },
+]
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="培训管理审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <base-info-detail :form-inline="dataForm" />
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="dataForm.trainStaffList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c630f58..a3eb850 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -135,6 +135,7 @@
     deptId: '',
     director: '',
     effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
     ids: [],
     trainEndTime: '',
     trainStartTime: '',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
deleted file mode 100644
index 64e17e4..0000000
--- a/src/views/measure/train/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
new file mode 100644
index 0000000..6e1cde3
--- /dev/null
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier } from '../plan_interface'
+import baseInfoDetail from './baseinfoDetail.vue'
+import { getListDetail } from '@/api/system/plan'
+import { submitApproval } from '@/api/approval'
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  deptId: '',
+  deptName: '',
+  director: '',
+  effectiveCompany: '',
+  planName: '',
+  planNo: '',
+  remark: '',
+  trainAddress: '',
+  trainContent: '',
+  trainHour: '',
+  trainNumber: 0,
+  trainPerson: '',
+  taskId: '',
+  trainStaffList: [
+    {
+      company: '',
+      examResult: '',
+      id: 0,
+      name: '',
+      remark: '',
+      signTime: '',
+      staffId: 0,
+      technologyJob: '',
+    },
+  ],
+  trainTime: '',
+})
+// 获取表单详情
+const getInfo = () => {
+  getListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    // if (dataForm.value.approvalStatus) {
+    //   // 待审批
+    //   if (dataForm.value.approvalStatus == '2') {
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
+    //     // todo：判断当前用户是否为发起人
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    // }
+  })
+}
+getInfo()
+
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime' },
+]
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="培训管理审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <base-info-detail :form-inline="dataForm" />
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="dataForm.trainStaffList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c630f58..a3eb850 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -135,6 +135,7 @@
     deptId: '',
     director: '',
     effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
     ids: [],
     trainEndTime: '',
     trainStartTime: '',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 6321ed6..20b5041 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -4,10 +4,12 @@
 import userListDialog from '../person/components/userListDialog.vue'
 import type { IOptions } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import {
   getDeptTree,
-  getListAdd,
   getListDetail,
+  getListSave,
+  getListSubmit,
   getListUpdate,
 } from '@/api/system/plan'
 const loading = ref(false) // 表单加载状态
@@ -45,6 +47,7 @@
   trainStaffList: [],
   trainTime: null,
 })
+const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 const columns = [
   { text: '学员名称', value: 'name' },
@@ -163,11 +166,16 @@
         type: 'warning',
       }).then(() => {
         if (buttonType === '提交' && pageType.value !== 'edit') {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
+          if (addId.value === '') {
+            ElMessage.warning('请先保存')
+          }
+          else {
+            getListSubmit({ id: addId.value, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+              if (res.code === 200) {
+                close()
+              }
+            })
+          }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
           formInline.value.trainStaffList.map((item) => {
@@ -208,15 +216,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        sessionStorage.setItem('formInline', JSON.stringify(formInline.value))
-        ElMessage.success('保存成功！')
+        getListSave(formInline.value).then((res) => {
+          if (res.code === 200) {
+            addId.value = res.data.id
+            ElMessage.success('保存成功！')
+          }
+        })
       })
     }
   })
 }
-if (sessionStorage.getItem('formInline')) {
-  formInline.value = JSON.parse(sessionStorage.getItem('formInline'))
-}
 </script>
 
 <template>
@@ -233,7 +242,6 @@
           {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
         <el-button
-          v-if="pageType === 'edit'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
deleted file mode 100644
index 64e17e4..0000000
--- a/src/views/measure/train/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
new file mode 100644
index 0000000..6e1cde3
--- /dev/null
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier } from '../plan_interface'
+import baseInfoDetail from './baseinfoDetail.vue'
+import { getListDetail } from '@/api/system/plan'
+import { submitApproval } from '@/api/approval'
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  deptId: '',
+  deptName: '',
+  director: '',
+  effectiveCompany: '',
+  planName: '',
+  planNo: '',
+  remark: '',
+  trainAddress: '',
+  trainContent: '',
+  trainHour: '',
+  trainNumber: 0,
+  trainPerson: '',
+  taskId: '',
+  trainStaffList: [
+    {
+      company: '',
+      examResult: '',
+      id: 0,
+      name: '',
+      remark: '',
+      signTime: '',
+      staffId: 0,
+      technologyJob: '',
+    },
+  ],
+  trainTime: '',
+})
+// 获取表单详情
+const getInfo = () => {
+  getListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    // if (dataForm.value.approvalStatus) {
+    //   // 待审批
+    //   if (dataForm.value.approvalStatus == '2') {
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
+    //     // todo：判断当前用户是否为发起人
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    // }
+  })
+}
+getInfo()
+
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime' },
+]
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="培训管理审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <base-info-detail :form-inline="dataForm" />
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="dataForm.trainStaffList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c630f58..a3eb850 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -135,6 +135,7 @@
     deptId: '',
     director: '',
     effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
     ids: [],
     trainEndTime: '',
     trainStartTime: '',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 6321ed6..20b5041 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -4,10 +4,12 @@
 import userListDialog from '../person/components/userListDialog.vue'
 import type { IOptions } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import {
   getDeptTree,
-  getListAdd,
   getListDetail,
+  getListSave,
+  getListSubmit,
   getListUpdate,
 } from '@/api/system/plan'
 const loading = ref(false) // 表单加载状态
@@ -45,6 +47,7 @@
   trainStaffList: [],
   trainTime: null,
 })
+const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 const columns = [
   { text: '学员名称', value: 'name' },
@@ -163,11 +166,16 @@
         type: 'warning',
       }).then(() => {
         if (buttonType === '提交' && pageType.value !== 'edit') {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
+          if (addId.value === '') {
+            ElMessage.warning('请先保存')
+          }
+          else {
+            getListSubmit({ id: addId.value, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+              if (res.code === 200) {
+                close()
+              }
+            })
+          }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
           formInline.value.trainStaffList.map((item) => {
@@ -208,15 +216,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        sessionStorage.setItem('formInline', JSON.stringify(formInline.value))
-        ElMessage.success('保存成功！')
+        getListSave(formInline.value).then((res) => {
+          if (res.code === 200) {
+            addId.value = res.data.id
+            ElMessage.success('保存成功！')
+          }
+        })
       })
     }
   })
 }
-if (sessionStorage.getItem('formInline')) {
-  formInline.value = JSON.parse(sessionStorage.getItem('formInline'))
-}
 </script>
 
 <template>
@@ -233,7 +242,6 @@
           {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
         <el-button
-          v-if="pageType === 'edit'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 4869328..fb2fa17 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -4,6 +4,7 @@
   director: string
   offset: number
   limit: number
+  formId: string
   createEndTime: string
   createStartTime: string
   ids: []
@@ -41,8 +42,8 @@
 }
 
 export interface ISupplier {
+  deptId: string
   createTime: string
-  deptId: number
   deptName: string
   director: string
   effectiveCompany: string
@@ -67,6 +68,7 @@
       technologyJob: string
     },
   ]
+  taskId?: string
   trainTime: string
 }
 
@@ -91,3 +93,8 @@
   trainTime: string
 }
 
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 28b50ba..c28e9ba 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -90,3 +90,21 @@
     data,
   })
 }
+
+// 获取到到期提醒列表
+export function getRemindListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `/meter/standard/remindListPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 点击提醒
+export function setRemind(data: object) {
+  return request({
+    url: '/meter/standard/remind',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index 511befd..3066ab3 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -23,7 +23,6 @@
     data,
   })
 }
-
 // 列表查询
 export function getPlanList(data: { offset: number; limit: number }) {
   return request({
@@ -33,6 +32,23 @@
   })
 }
 
+// 审批列表查询
+export function getapprovalList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/train/plan/approval/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训计划审批删除
+export function getApprovalDelete(data: object) {
+  return request({
+    url: `${prefix}/train/plan/approval/operate/delete`,
+    method: 'post',
+    data,
+  })
+}
 // 主管部门
 export function getDeptTree(params: object) {
   return request({
@@ -42,10 +58,18 @@
   })
 }
 
-// 培训计划新建
-export function getListAdd(data: object) {
+// 培训计划保存
+export function getListSave(data: object) {
   return request({
-    url: `${prefix}/train/plan/add`,
+    url: `${prefix}/train/plan/save`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function getListSubmit(data: object) {
+  return request({
+    url: `${prefix}/train/plan/submit`,
     method: 'post',
     data,
   })
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index 7bde3f8..64a02ff 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -284,7 +284,7 @@
       {
         path: 'trainPlanApprove/:type/:id?',
         name: 'listPageAdd',
-        component: () => import('@/views/measure/train/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/train/components/planApprovalDetail.vue'),
         meta: {
           title: '培训计划审批',
           icon: 'ep:key',
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 7627e4e..1340e03 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -2,21 +2,23 @@
 import { ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, IlistType } from './standard_interface'
-import StandardListAdd from './components/standardListAdd.vue'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
+import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
 // 逻辑代码
 const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+  category: null,
   id: null,
+  managerState: null,
+  preparationEndDate: '',
+  preparationStartDate: '',
+  standardLaboratory: null,
+  standardName: '',
+  standardNo: '',
+  validEndTime: '',
+  validStartTime: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
@@ -42,7 +44,7 @@
   },
   {
     text: '标准所在部门',
-    value: 'standardLaboratoryName',
+    value: 'standardLaboratory',
     width: '120',
     align: 'center',
   },
@@ -53,7 +55,7 @@
   },
   {
     text: '建标项目',
-    value: 'standardOwnerName',
+    value: 'constructionStandardUnitName',
     align: 'center',
   },
   {
@@ -91,7 +93,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getStandardList(listQuery.value).then((response) => {
+  getRemindListPage(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
     loadingTable.value = false
@@ -133,19 +135,35 @@
   standardUsersDeptList.value = res.data.rows
 })
 
+// 筹建日期数组
+const preparationArr = ref([
+  listQuery.value.preparationStartDate,
+  listQuery.value.preparationEndDate,
+])
+// 到期开始以及结束数组
+const validTimeArr = ref([
+  listQuery.value.validStartTime,
+  listQuery.value.validStartTime,
+])
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
-    category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    category: null,
     id: null,
+    managerState: null,
+    preparationEndDate: '',
+    preparationStartDate: '',
+    standardLaboratory: null,
+    standardName: '',
+    standardNo: '',
+    validEndTime: '',
+    validStartTime: '',
     offset: 1,
-    limit: 10,
+    limit: 20,
   }
+  preparationArr.value = []
+  validTimeArr.value = []
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -164,12 +182,13 @@
 // 打印
 const printObj = ref({
   id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  popTitle: '到期提醒模板', // 打印配置页上方的标题
   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
 })
+
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -245,7 +264,28 @@
   $router.push(`/standard/detail/${row.id}`)
 }
 // 提醒函数
-const warnClick = (row: object) => {}
+const warnClick = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认提醒${row.standardName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      setRemind({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '提醒成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
 </script>
 
 <template>
@@ -315,22 +355,24 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="preparationArr"
+          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="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
+          v-model="validTimeArr"
+          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>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
deleted file mode 100644
index 8c6a226..0000000
--- a/src/views/measure/train/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
deleted file mode 100644
index b60bc14..0000000
--- a/src/views/measure/train/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
new file mode 100644
index 0000000..f979c5d
--- /dev/null
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -0,0 +1,152 @@
+<script lang="ts" setup name="BaseInfoDetail">
+/**
+ * 培训计划-基础信息表单
+ */
+import type { PropType } from 'vue'
+import type { FormInstance, UploadUserFile } from 'element-plus'
+// 按钮加载状态
+const props = defineProps({
+  formInline: {
+    type: Object,
+    required: true,
+  },
+})
+const companyAddress = computed(() => {
+  return [props.formInline.companyCountryName, props.formInline.companyProvinceName, props.formInline.companyCityName, props.formInline.companyAreaName, props.formInline.companyAddress]
+})
+const invoiceAddress = computed(() => {
+  return [props.formInline.invoiceCountryName, props.formInline.invoiceProvinceName, props.formInline.invoiceCityName, props.formInline.invoiceAreaName, props.formInline.invoiceAddress]
+})
+
+const ruleFormRef = ref<FormInstance>()
+</script>
+
+<template>
+  <div id="form">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      class="demo-form-inline"
+      label-width="auto"
+      label-position="right"
+    >
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="计划编号:" prop="planNo">
+            <el-input
+              v-model="formInline.planNo"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训名称:" prop="planName">
+            <el-input
+              v-model="formInline.planName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训对象:" prop="trainPerson">
+            <el-input
+              v-model="formInline.trainPerson"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训人数:" prop="trainNumber">
+            <el-input
+              v-model="formInline.trainNumber"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="培训时间:" prop="trainTime">
+            <el-input
+              v-model="formInline.trainTime"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训学时:" prop="trainHour">
+            <el-input
+              v-model="formInline.trainHour"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="主管部门:" prop="deptName">
+            <el-input
+              v-model="formInline.deptName"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="实施单位:" prop="effectiveCompany">
+            <el-input
+              v-model="formInline.effectiveCompany"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="6">
+          <el-form-item label="负责人:" prop="director">
+            <el-input
+              v-model="formInline.director"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="培训地点:" prop="trainAddress">
+            <el-input
+              v-model="formInline.trainAddress"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="培训内容:" prop="trainContent">
+            <el-input
+              v-model="formInline.trainContent"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
+        <el-col :span="12">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              class="detail-input"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
diff --git a/src/views/measure/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
deleted file mode 100644
index 4de32c0..0000000
--- a/src/views/measure/train/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary', info: 'edit' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
deleted file mode 100644
index 1a97b9b..0000000
--- a/src/views/measure/train/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
deleted file mode 100644
index 642c758..0000000
--- a/src/views/measure/train/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary', info: 'detail' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index 1e93982..4d0bdad 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -4,7 +4,7 @@
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
@@ -28,18 +28,15 @@
 // 查询条件
 const listQuery: Ref<IlistTypes> = ref({
   approvalStatus: props.status,
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
   formId: SCHEDULE.TRAIN_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
+  createTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  trainTime: '',
   offset: 1,
   limit: 20,
 })
-// 控制是否显示新增页面
-const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
 // 总数
@@ -50,72 +47,72 @@
 const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
-    value: 'name',
+    value: 'planNo',
     width: '90',
     align: 'center',
   },
   {
     text: '培训名称',
-    value: 'name',
+    value: 'planName',
     width: '90',
     align: 'center',
   },
   {
     text: '培训对象',
-    value: 'name',
+    value: 'trainPerson',
     width: '90',
     align: 'center',
   },
   {
     text: '培训人数',
-    value: 'name',
+    value: 'trainNumber',
     width: '90',
     align: 'center',
   },
   {
     text: '培训学时',
-    value: 'name',
+    value: 'trainHour',
     width: '90',
     align: 'center',
   },
   {
     text: '培训时间',
-    value: 'name',
+    value: 'trainTime',
     width: '90',
     align: 'center',
   },
   {
     text: '主管部门',
-    value: 'name',
+    value: 'deptName',
     width: '90',
     align: 'center',
   },
   {
     text: '实施单位',
-    value: 'name',
+    value: 'effectiveCompany',
     width: '90',
     align: 'center',
   },
   {
     text: '负责人',
-    value: 'name',
+    value: 'director',
     align: 'center',
   },
   {
     text: '培训内容',
-    value: 'name',
+    value: 'trainContent',
     width: '90',
     align: 'center',
   },
   {
     text: '创建时间',
-    value: 'name',
+    value: 'createTime',
     width: '90',
     align: 'center',
   },
   {
     text: '审批状态',
-    value: 'name',
+    value: 'approvalStatusName',
     width: '90',
     align: 'center',
   },
@@ -140,7 +137,7 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  getapprovalListPage(listQuery.value).then((response) => {
+  getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     // list.value = [
     //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
@@ -163,6 +160,7 @@
 interface rowReturn {
   id: string
   supplierName: string
+  taskId: string
 }
 const buttonTypeMap = ref('')
 // 点击删除或者取消
@@ -176,7 +174,7 @@
       type: 'warning',
     },
   ).then(() => {
-    getSoucreListDelete({ id: row.id }).then((res) => {
+    getApprovalDelete({ id: row.id, taskId: row.taskId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -227,13 +225,12 @@
 const clearList = () => {
   listQuery.value = {
     approvalStatus: props.status,
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
     formId: SCHEDULE.TRAIN_APPROVAL,
-    supplierName: '',
-    supplierNo: '',
+    createTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
     offset: 1,
     limit: 20,
   }
@@ -277,7 +274,37 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
 }
 // 批量导出
 const exportAll = () => {
@@ -298,8 +325,11 @@
     case '查看':
       goDetail(row)
       break
+    case '提交':
+      approvalSubmit(row)
+      break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/train/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -323,7 +353,6 @@
 watch (
   () => props.status,
   (newVal: string) => {
-    console.log('change status')
     listQuery.value.approvalStatus = newVal
     fetchData(false)
   },
@@ -340,90 +369,88 @@
 </script>
 
 <template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <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"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="listQuery.createTime"
+          type="datetime"
+          placeholder="创建时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
         >
-          <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+      <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-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+      </template>
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" :width="operationWidth">
+            <template #default="{ row }">
+              <el-button
+                v-for="(item, index) in buttons"
+                :key="index"
+                size="small"
+                :type="item.type" link
+                @click="clickBtn(row, item.name)"
+              >
+                {{ item.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
 </template>
 
diff --git a/src/views/measure/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
deleted file mode 100644
index 012ead3..0000000
--- a/src/views/measure/train/components/listPage.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistType } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
-import { getDeptTree } from '@/api/system/plan'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 禁用
-// 查询条件
-const listQuery: Ref<IlistQuery> = ref({
-  supplierNo: '', // 业务内容
-  supplierName: '', // 溯源供方名称
-  businessContent: '', // 溯源供方编号
-  offset: 1,
-  limit: 10,
-})
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([
-  { name: '张三' },
-])
-// 总数
-const total = ref(0)
-// 表头
-const columns = ref([
-  {
-    text: '计划编号',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'name',
-    width: '90',
-    align: 'center',
-  },
-])
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-// 主管部门下拉框
-const options = ref<IOptions[]>([])
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击编辑id和删除row类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-// 初始化路由
-const $router = useRouter()
-// 点击删除
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      getSoucreListDelete({ id: row.id as string }).then((res) => {
-        if (res.code === 200) {
-          ElMessage({
-            type: 'success',
-            message: '删除成功',
-          })
-          fetchData(true)
-        }
-      })
-    })
-}
-const pageTypeMap = ref('')
-// 点击编辑/详情
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/train/trainPlanApprove/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    applyShow.value = true
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-
-// 点击搜索
-const searchList = () => {
-  // fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    supplierNo: '', // 业务内容
-    supplierName: '', // 溯源供方名称
-    businessContent: '', // 溯源供方编号
-    offset: 1,
-    limit: 20,
-  }
-}
-// 关闭编辑
-const close = () => {
-  show.value = true
-  // fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  if (event.target.files[0].type === 'application/pdf') {
-    if (event.target.files?.length !== 0) {
-      // 创建formdata对象
-      const fd = new FormData()
-      fd.append('multipartFile', event.target.files[0])
-      uploadApi(fd).then((res) => {
-        if (res.code === 200) {
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
-  }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  fetchData(true)
-}
-const upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 新增页面显示就调用父组件方法禁用tap栏
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierNo"
-            type="datetime"
-            placeholder="培训时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="listQuery.supplierName"
-            type="datetime"
-            placeholder="创建时间"
-            format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
-            :disabled="buttonType === '详情'"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            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>
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="实施单位"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="负责人"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </template>
-        <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.pagination {
-  position: fixed;
-  bottom: 0;
-}
-</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
deleted file mode 100644
index 5f745f6..0000000
--- a/src/views/measure/train/components/listPageAdd.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<script lang="ts" setup name="listPageAdd">
-import type { FormInstance } from 'element-plus'
-import { ElMessageBox } from 'element-plus'
-import { pa } from 'element-plus/es/locale'
-import ManageBox from './manageBox.vue'
-import {
-  getDeptTree,
-  getListAdd,
-  getListDetail,
-  getListLogupdate,
-} from '@/api/system/plan'
-
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('detail') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  createTime: null,
-  deptId: null,
-  deptName: null,
-  director: null,
-  effectiveCompany: null,
-  id: null,
-  planName: null,
-  planNo: null,
-  remark: null,
-  trainAddress: null,
-  trainContent: null,
-  trainHour: null,
-  trainNumber: null,
-  trainPerson: null,
-  trainStaffList: [],
-  trainTime: null,
-})
-// 主管部门下拉框
-const options = ref([])
-const ruleFormRef = ref<FormInstance>()
-const columns = [
-  { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
-  { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
-]
-const dialogVisible = ref(false)
-// 校验规则
-const rules = ref({
-  planNo: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
-  planName: [{ required: true, message: '培训名称不能为空', trigger: 'blur' }],
-  trainPerson: [{ required: true, message: '培训对象不能为空', trigger: 'blur' }],
-  trainNumber: [{ required: true, message: '培训人数不能为空', trigger: 'blur' }],
-  trainHour: [{ required: true, message: '培训学时不能为空', trigger: 'blur' }],
-  trainTime: [{ required: true, message: '培训时间不能为空', trigger: 'blur' }],
-  trainAddress: [{ required: true, message: '培训地点不能为空', trigger: 'blur' }],
-  deptName: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-  effectiveCompany: [{ required: true, message: '实施单位不能为空', trigger: 'blur' }],
-  director: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
-  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const addPersonList = ref({
-  company: '',
-  examResult: '',
-  id: 0,
-  name: '',
-  remark: '',
-  signTime: '',
-  staffId: 0,
-  technologyJob: '',
-})
-const SelectionList = ref([])
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    roleId: '',
-    deptType: '',
-    tips: '',
-  }
-  getDeptTree(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
-  )
-  dialogVisible.value = true
-}
-// 点击关闭
-const handleVisibleClose = () => {
-  dialogVisible.value = false
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
-    (item) => {
-      return !SelectionList.value.includes(item)
-    },
-  )
-}
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-if (infoId.value && infoId.value !== '') {
-  getListDetail({ id: infoId.value }).then((res) => {
-    formInline.value = res.data
-  })
-}
-const getAddList = async (formEl: FormInstance | undefined, buttonType: string) => {
-  console.log(formInline.value)
-  if (buttonType === '提交' && pageType.value !== 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${buttonType}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button v-if=" pageType === 'edit'" type="primary">
-          保存
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        :rules="rules"
-        label-width="auto"
-        label-position="right"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
-              <el-input
-                v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训名称:" prop="planName">
-              <el-input
-                v-model="formInline.planName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训对象:" prop="trainPerson">
-              <el-input
-                v-model="formInline.trainPerson"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训对象'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训人数:" prop="trainNumber">
-              <el-input
-                v-model="formInline.trainNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训人数'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="培训时间:" prop="trainTime">
-              <el-date-picker
-                v-model="formInline.trainTime"
-                type="datetime"
-                placeholder="培训时间"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训学时:" prop="trainHour">
-              <el-input
-                v-model="formInline.trainHour"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训学时'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="主管部门:" prop="deptName">
-              <el-select
-                v-model="formInline.deptName"
-                clearable
-                placeholder="主管部门"
-                size="default"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="实施单位:" prop="effectiveCompany">
-              <el-input
-                v-model="formInline.effectiveCompany"
-                :placeholder="pageType === 'detail' ? '无' : '请输入实施单位'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="负责人:" prop="director">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="培训地点:" prop="trainAddress">
-              <el-input
-                v-model="formInline.trainAddress"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训地点'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="培训内容:" prop="trainContent">
-              <el-input
-                v-model="formInline.trainContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="12">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template #btns>
-        <el-button v-if="buttonType !== '详情'" type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button v-if="buttonType !== '详情'" type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="formInline.trainStaffList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-        />
-      </el-table>
-    </detail-block>
-  </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleVisibleClose"
-    center
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-    >
-      <el-form-item label="学员名称">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <el-button type="primary" class="dialog-button" @click="addPushList">
-      完成
-    </el-button>
-  </el-dialog>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/train/components/manageBox.vue b/src/views/measure/train/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/train/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
deleted file mode 100644
index a1aa4dc..0000000
--- a/src/views/measure/train/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/passed.vue b/src/views/measure/train/components/passed.vue
deleted file mode 100644
index 64e17e4..0000000
--- a/src/views/measure/train/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary', info: 'detail' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
new file mode 100644
index 0000000..6e1cde3
--- /dev/null
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -0,0 +1,209 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier } from '../plan_interface'
+import baseInfoDetail from './baseinfoDetail.vue'
+import { getListDetail } from '@/api/system/plan'
+import { submitApproval } from '@/api/approval'
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  deptId: '',
+  deptName: '',
+  director: '',
+  effectiveCompany: '',
+  planName: '',
+  planNo: '',
+  remark: '',
+  trainAddress: '',
+  trainContent: '',
+  trainHour: '',
+  trainNumber: 0,
+  trainPerson: '',
+  taskId: '',
+  trainStaffList: [
+    {
+      company: '',
+      examResult: '',
+      id: 0,
+      name: '',
+      remark: '',
+      signTime: '',
+      staffId: 0,
+      technologyJob: '',
+    },
+  ],
+  trainTime: '',
+})
+// 获取表单详情
+const getInfo = () => {
+  getListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    // if (dataForm.value.approvalStatus) {
+    //   // 待审批
+    //   if (dataForm.value.approvalStatus == '2') {
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
+    //     // todo：判断当前用户是否为发起人
+    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+    //   }
+    // }
+  })
+}
+getInfo()
+
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime' },
+]
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="培训管理审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <base-info-detail :form-inline="dataForm" />
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="dataForm.trainStaffList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index c630f58..a3eb850 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -135,6 +135,7 @@
     deptId: '',
     director: '',
     effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
     ids: [],
     trainEndTime: '',
     trainStartTime: '',
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 6321ed6..20b5041 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -4,10 +4,12 @@
 import userListDialog from '../person/components/userListDialog.vue'
 import type { IOptions } from './plan_interface'
 import DeptSelect from '@/components/DeptSelect/index.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import {
   getDeptTree,
-  getListAdd,
   getListDetail,
+  getListSave,
+  getListSubmit,
   getListUpdate,
 } from '@/api/system/plan'
 const loading = ref(false) // 表单加载状态
@@ -45,6 +47,7 @@
   trainStaffList: [],
   trainTime: null,
 })
+const addId = ref('') // 保存后的id
 const ruleFormRef = ref<FormInstance>()
 const columns = [
   { text: '学员名称', value: 'name' },
@@ -163,11 +166,16 @@
         type: 'warning',
       }).then(() => {
         if (buttonType === '提交' && pageType.value !== 'edit') {
-          getListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
+          if (addId.value === '') {
+            ElMessage.warning('请先保存')
+          }
+          else {
+            getListSubmit({ id: addId.value, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+              if (res.code === 200) {
+                close()
+              }
+            })
+          }
         }
         else if (buttonType === '提交' && pageType.value === 'edit') {
           formInline.value.trainStaffList.map((item) => {
@@ -208,15 +216,16 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        sessionStorage.setItem('formInline', JSON.stringify(formInline.value))
-        ElMessage.success('保存成功！')
+        getListSave(formInline.value).then((res) => {
+          if (res.code === 200) {
+            addId.value = res.data.id
+            ElMessage.success('保存成功！')
+          }
+        })
       })
     }
   })
 }
-if (sessionStorage.getItem('formInline')) {
-  formInline.value = JSON.parse(sessionStorage.getItem('formInline'))
-}
 </script>
 
 <template>
@@ -233,7 +242,6 @@
           {{ pageType === 'detail' ? '打印' : '提交' }}
         </el-button>
         <el-button
-          v-if="pageType === 'edit'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 4869328..fb2fa17 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -4,6 +4,7 @@
   director: string
   offset: number
   limit: number
+  formId: string
   createEndTime: string
   createStartTime: string
   ids: []
@@ -41,8 +42,8 @@
 }
 
 export interface ISupplier {
+  deptId: string
   createTime: string
-  deptId: number
   deptName: string
   director: string
   effectiveCompany: string
@@ -67,6 +68,7 @@
       technologyJob: string
     },
   ]
+  taskId?: string
   trainTime: string
 }
 
@@ -91,3 +93,8 @@
   trainTime: string
 }
 
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index ce76ace..433ad5d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions } from './plan_interface'
 import userListDialog from './components/userListDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import useUserStore from '@/store/modules/user.ts'
 import {
   getListDetail,
@@ -97,6 +98,7 @@
     deptId: 0,
     director: '',
     effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
     trainTime: '',
   }
   getPlanIdList(params).then((response) => {