diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 6c88385..136f0a8 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -65,21 +64,6 @@
   },
 ])
 
-// 表格loding
-const listLoading = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData(true)
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -91,6 +75,20 @@
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
+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
@@ -106,16 +104,6 @@
   isPopconfirmShow.value = true
   deleteId.value = row.id
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -192,6 +180,16 @@
     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()
 }
@@ -232,7 +230,8 @@
   <div v-if="show">
     <app-container>
       <search-area
-        @search="searchList"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
       >
         <search-item>
           <el-input
@@ -255,11 +254,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="clearList">
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -280,64 +274,43 @@
           </el-button>
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="30" />
-          <el-table-column align="center" label="#" width="30" type="index" />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="200">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
     <el-dialog
       v-model="isPopconfirmShow"
       title="确认框"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 6c88385..136f0a8 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -65,21 +64,6 @@
   },
 ])
 
-// 表格loding
-const listLoading = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData(true)
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -91,6 +75,20 @@
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
+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
@@ -106,16 +104,6 @@
   isPopconfirmShow.value = true
   deleteId.value = row.id
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -192,6 +180,16 @@
     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()
 }
@@ -232,7 +230,8 @@
   <div v-if="show">
     <app-container>
       <search-area
-        @search="searchList"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
       >
         <search-item>
           <el-input
@@ -255,11 +254,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="clearList">
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -280,64 +274,43 @@
           </el-button>
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="30" />
-          <el-table-column align="center" label="#" width="30" type="index" />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="200">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
     <el-dialog
       v-model="isPopconfirmShow"
       title="确认框"
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 4273146..a2f21a5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
 import { reactive, ref } from 'vue'
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
@@ -25,7 +24,11 @@
 const show = ref(true)
 const infoId = ref('')
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -33,11 +36,11 @@
   getPlanList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 fetchData(true)
-// 主管部门下拉框
-const options = ref([])
+
 // 表头
 const columns = ref([
   {
@@ -53,14 +56,17 @@
   {
     text: '培训对象',
     value: 'trainPerson',
+    width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
+    width: '120',
   },
   {
     text: '培训学时',
     value: 'trainHour',
+    width: '120',
   },
   {
     text: '培训时间',
@@ -75,10 +81,12 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
+    width: '120',
   },
   {
     text: '培训内容',
     value: 'trainContent',
+    width: '120',
   },
   {
     text: '创建时间',
@@ -88,6 +96,7 @@
   {
     text: '备注',
     value: 'remark',
+    width: '120',
   },
 ])
 // 搜索
@@ -116,7 +125,7 @@
   if (checkoutList.value.length <= 0) {
     exportExcel({
       json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -124,7 +133,7 @@
   else {
     exportExcel({
       json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -137,6 +146,7 @@
   fetchData(true)
 }
 const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
@@ -148,18 +158,9 @@
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
   checkoutList.value = e
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 const add = () => {
   infoId.value = ''
   buttonType.value = '新建'
@@ -188,6 +189,16 @@
     }
   })
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -220,7 +231,7 @@
 <template>
   <div v-if="show">
     <app-container>
-      <search-area @search="searchList">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
             v-model="listQuery.trainTime"
@@ -268,17 +279,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            :style="{ marginTop: '-10px' }"
-            @click="clearList"
-          >
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -292,76 +292,50 @@
             打印
           </el-button>
         </template>
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            label="序号"
-            width="80"
-            type="index"
-          />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="240">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-              >
-                二维码
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                >
+                  二维码
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
   </div>
   <plan-add
     v-else :info-id="infoId"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 6c88385..136f0a8 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -65,21 +64,6 @@
   },
 ])
 
-// 表格loding
-const listLoading = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData(true)
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -91,6 +75,20 @@
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
+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
@@ -106,16 +104,6 @@
   isPopconfirmShow.value = true
   deleteId.value = row.id
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -192,6 +180,16 @@
     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()
 }
@@ -232,7 +230,8 @@
   <div v-if="show">
     <app-container>
       <search-area
-        @search="searchList"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
       >
         <search-item>
           <el-input
@@ -255,11 +254,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="clearList">
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -280,64 +274,43 @@
           </el-button>
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="30" />
-          <el-table-column align="center" label="#" width="30" type="index" />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="200">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
     <el-dialog
       v-model="isPopconfirmShow"
       title="确认框"
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 4273146..a2f21a5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
 import { reactive, ref } from 'vue'
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
@@ -25,7 +24,11 @@
 const show = ref(true)
 const infoId = ref('')
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -33,11 +36,11 @@
   getPlanList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 fetchData(true)
-// 主管部门下拉框
-const options = ref([])
+
 // 表头
 const columns = ref([
   {
@@ -53,14 +56,17 @@
   {
     text: '培训对象',
     value: 'trainPerson',
+    width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
+    width: '120',
   },
   {
     text: '培训学时',
     value: 'trainHour',
+    width: '120',
   },
   {
     text: '培训时间',
@@ -75,10 +81,12 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
+    width: '120',
   },
   {
     text: '培训内容',
     value: 'trainContent',
+    width: '120',
   },
   {
     text: '创建时间',
@@ -88,6 +96,7 @@
   {
     text: '备注',
     value: 'remark',
+    width: '120',
   },
 ])
 // 搜索
@@ -116,7 +125,7 @@
   if (checkoutList.value.length <= 0) {
     exportExcel({
       json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -124,7 +133,7 @@
   else {
     exportExcel({
       json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -137,6 +146,7 @@
   fetchData(true)
 }
 const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
@@ -148,18 +158,9 @@
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
   checkoutList.value = e
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 const add = () => {
   infoId.value = ''
   buttonType.value = '新建'
@@ -188,6 +189,16 @@
     }
   })
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -220,7 +231,7 @@
 <template>
   <div v-if="show">
     <app-container>
-      <search-area @search="searchList">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
             v-model="listQuery.trainTime"
@@ -268,17 +279,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            :style="{ marginTop: '-10px' }"
-            @click="clearList"
-          >
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -292,76 +292,50 @@
             打印
           </el-button>
         </template>
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            label="序号"
-            width="80"
-            type="index"
-          />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="240">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-              >
-                二维码
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                >
+                  二维码
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
   </div>
   <plan-add
     v-else :info-id="infoId"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index ac8d85d..2ce01d7 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup name="PlanAdd">
-import { getDeptTree, getListAdd, getListDetail, getListUpdate } from '@/api/system/plan'
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
 
 const props = defineProps({
   infoId: {
@@ -36,7 +41,7 @@
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -100,11 +105,23 @@
 }
 const getAddList = (buttonType: string) => {
   if (buttonType === '提交' && props.buttonType !== '编辑') {
-    getListAdd(formInline.value).then((res) => {})
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
     formInline.value.id = props.infoId
-    getListUpdate(formInline.value).then((res) => {})
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else {
     // 打印
@@ -313,13 +330,24 @@
       :model="addPersonList"
       style="max-width: 460px;"
     >
-      <el-form-item
-        v-for="column in columns"
-        :key="column.value"
-        :label="column.text"
-        :prop="addPersonList[column.value]"
-      >
-        <el-input v-model="addPersonList[column.value]" />
+      <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="buttonType === '详情'"
+        />
       </el-form-item>
     </el-form>
     <el-button type="primary" class="dialog-button" @click="addPushList">

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 6c88385..136f0a8 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -65,21 +64,6 @@
   },
 ])
 
-// 表格loding
-const listLoading = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData(true)
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -91,6 +75,20 @@
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
+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
@@ -106,16 +104,6 @@
   isPopconfirmShow.value = true
   deleteId.value = row.id
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -192,6 +180,16 @@
     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()
 }
@@ -232,7 +230,8 @@
   <div v-if="show">
     <app-container>
       <search-area
-        @search="searchList"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
       >
         <search-item>
           <el-input
@@ -255,11 +254,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="clearList">
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -280,64 +274,43 @@
           </el-button>
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="30" />
-          <el-table-column align="center" label="#" width="30" type="index" />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="200">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
     <el-dialog
       v-model="isPopconfirmShow"
       title="确认框"
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 4273146..a2f21a5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
 import { reactive, ref } from 'vue'
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
@@ -25,7 +24,11 @@
 const show = ref(true)
 const infoId = ref('')
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -33,11 +36,11 @@
   getPlanList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 fetchData(true)
-// 主管部门下拉框
-const options = ref([])
+
 // 表头
 const columns = ref([
   {
@@ -53,14 +56,17 @@
   {
     text: '培训对象',
     value: 'trainPerson',
+    width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
+    width: '120',
   },
   {
     text: '培训学时',
     value: 'trainHour',
+    width: '120',
   },
   {
     text: '培训时间',
@@ -75,10 +81,12 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
+    width: '120',
   },
   {
     text: '培训内容',
     value: 'trainContent',
+    width: '120',
   },
   {
     text: '创建时间',
@@ -88,6 +96,7 @@
   {
     text: '备注',
     value: 'remark',
+    width: '120',
   },
 ])
 // 搜索
@@ -116,7 +125,7 @@
   if (checkoutList.value.length <= 0) {
     exportExcel({
       json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -124,7 +133,7 @@
   else {
     exportExcel({
       json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -137,6 +146,7 @@
   fetchData(true)
 }
 const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
@@ -148,18 +158,9 @@
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
   checkoutList.value = e
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 const add = () => {
   infoId.value = ''
   buttonType.value = '新建'
@@ -188,6 +189,16 @@
     }
   })
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -220,7 +231,7 @@
 <template>
   <div v-if="show">
     <app-container>
-      <search-area @search="searchList">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
             v-model="listQuery.trainTime"
@@ -268,17 +279,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            :style="{ marginTop: '-10px' }"
-            @click="clearList"
-          >
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -292,76 +292,50 @@
             打印
           </el-button>
         </template>
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            label="序号"
-            width="80"
-            type="index"
-          />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="240">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-              >
-                二维码
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                >
+                  二维码
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
   </div>
   <plan-add
     v-else :info-id="infoId"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index ac8d85d..2ce01d7 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup name="PlanAdd">
-import { getDeptTree, getListAdd, getListDetail, getListUpdate } from '@/api/system/plan'
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
 
 const props = defineProps({
   infoId: {
@@ -36,7 +41,7 @@
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -100,11 +105,23 @@
 }
 const getAddList = (buttonType: string) => {
   if (buttonType === '提交' && props.buttonType !== '编辑') {
-    getListAdd(formInline.value).then((res) => {})
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
     formInline.value.id = props.infoId
-    getListUpdate(formInline.value).then((res) => {})
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else {
     // 打印
@@ -313,13 +330,24 @@
       :model="addPersonList"
       style="max-width: 460px;"
     >
-      <el-form-item
-        v-for="column in columns"
-        :key="column.value"
-        :label="column.text"
-        :prop="addPersonList[column.value]"
-      >
-        <el-input v-model="addPersonList[column.value]" />
+      <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="buttonType === '详情'"
+        />
       </el-form-item>
     </el-form>
     <el-button type="primary" class="dialog-button" @click="addPushList">
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2010edd..6524e67 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -24,3 +24,28 @@
   trainTime: string
 }
 
+export interface IlistQuerys {
+  trainTime: string
+  createTime: string
+  logNo: string
+  trainName: string
+  offset: number
+  limit: number
+}
+
+export interface IlistTypes {
+  createTime: string
+  deptName: string
+  director: string
+  effectiveCompany: string
+  planName: string
+  planNo: string
+  remark: string
+  trainAddress: string
+  trainContent: string
+  trainHour: string
+  trainNumber: number
+  trainPerson: string
+  trainTime: string
+}
+

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 6c88385..136f0a8 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -65,21 +64,6 @@
   },
 ])
 
-// 表格loding
-const listLoading = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData(true)
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -91,6 +75,20 @@
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
+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
@@ -106,16 +104,6 @@
   isPopconfirmShow.value = true
   deleteId.value = row.id
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -192,6 +180,16 @@
     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()
 }
@@ -232,7 +230,8 @@
   <div v-if="show">
     <app-container>
       <search-area
-        @search="searchList"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
       >
         <search-item>
           <el-input
@@ -255,11 +254,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="clearList">
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -280,64 +274,43 @@
           </el-button>
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="30" />
-          <el-table-column align="center" label="#" width="30" type="index" />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="200">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
     <el-dialog
       v-model="isPopconfirmShow"
       title="确认框"
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 4273146..a2f21a5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
 import { reactive, ref } from 'vue'
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
@@ -25,7 +24,11 @@
 const show = ref(true)
 const infoId = ref('')
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -33,11 +36,11 @@
   getPlanList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 fetchData(true)
-// 主管部门下拉框
-const options = ref([])
+
 // 表头
 const columns = ref([
   {
@@ -53,14 +56,17 @@
   {
     text: '培训对象',
     value: 'trainPerson',
+    width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
+    width: '120',
   },
   {
     text: '培训学时',
     value: 'trainHour',
+    width: '120',
   },
   {
     text: '培训时间',
@@ -75,10 +81,12 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
+    width: '120',
   },
   {
     text: '培训内容',
     value: 'trainContent',
+    width: '120',
   },
   {
     text: '创建时间',
@@ -88,6 +96,7 @@
   {
     text: '备注',
     value: 'remark',
+    width: '120',
   },
 ])
 // 搜索
@@ -116,7 +125,7 @@
   if (checkoutList.value.length <= 0) {
     exportExcel({
       json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -124,7 +133,7 @@
   else {
     exportExcel({
       json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -137,6 +146,7 @@
   fetchData(true)
 }
 const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
@@ -148,18 +158,9 @@
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
   checkoutList.value = e
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 const add = () => {
   infoId.value = ''
   buttonType.value = '新建'
@@ -188,6 +189,16 @@
     }
   })
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -220,7 +231,7 @@
 <template>
   <div v-if="show">
     <app-container>
-      <search-area @search="searchList">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
             v-model="listQuery.trainTime"
@@ -268,17 +279,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            :style="{ marginTop: '-10px' }"
-            @click="clearList"
-          >
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -292,76 +292,50 @@
             打印
           </el-button>
         </template>
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            label="序号"
-            width="80"
-            type="index"
-          />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="240">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-              >
-                二维码
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                >
+                  二维码
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
   </div>
   <plan-add
     v-else :info-id="infoId"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index ac8d85d..2ce01d7 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup name="PlanAdd">
-import { getDeptTree, getListAdd, getListDetail, getListUpdate } from '@/api/system/plan'
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
 
 const props = defineProps({
   infoId: {
@@ -36,7 +41,7 @@
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -100,11 +105,23 @@
 }
 const getAddList = (buttonType: string) => {
   if (buttonType === '提交' && props.buttonType !== '编辑') {
-    getListAdd(formInline.value).then((res) => {})
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
     formInline.value.id = props.infoId
-    getListUpdate(formInline.value).then((res) => {})
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else {
     // 打印
@@ -313,13 +330,24 @@
       :model="addPersonList"
       style="max-width: 460px;"
     >
-      <el-form-item
-        v-for="column in columns"
-        :key="column.value"
-        :label="column.text"
-        :prop="addPersonList[column.value]"
-      >
-        <el-input v-model="addPersonList[column.value]" />
+      <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="buttonType === '详情'"
+        />
       </el-form-item>
     </el-form>
     <el-button type="primary" class="dialog-button" @click="addPushList">
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2010edd..6524e67 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -24,3 +24,28 @@
   trainTime: string
 }
 
+export interface IlistQuerys {
+  trainTime: string
+  createTime: string
+  logNo: string
+  trainName: string
+  offset: number
+  limit: number
+}
+
+export interface IlistTypes {
+  createTime: string
+  deptName: string
+  director: string
+  effectiveCompany: string
+  planName: string
+  planNo: string
+  remark: string
+  trainAddress: string
+  trainContent: string
+  trainHour: string
+  trainNumber: number
+  trainPerson: string
+  trainTime: string
+}
+
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f87a4a5..56b2ec7 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,3 +1,316 @@
+<script lang="ts" setup name="ListPlan">
+import type { Ref } from 'vue'
+import { reactive, ref } from 'vue'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuerys, IlistTypes } from './plan_interface'
+import PlanAdd from './trainLogAdd.vue'
+import { exportExcel } from '@/utils/exportXlsx'
+import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+const listQuery: Ref<IlistQuerys> = ref({
+  trainTime: '',
+  createTime: '',
+  logNo: '',
+  trainName: '',
+  offset: 1,
+  limit: 10,
+})
+const checkoutList = ref([])
+const list = ref([])
+// 删除id
+const deleteId = ref('')
+const isPopconfirmShow = ref(false)
+const total = ref(0)
+const show = ref(true)
+const infoId = ref('')
+const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getLogList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 表头
+const columns = ref([
+  {
+    text: '记录编号',
+    value: 'logNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'trainName',
+    width: '120',
+  },
+  {
+    text: '培训时间',
+    value: 'trainTime',
+    width: '120',
+  },
+  {
+    text: '培训地点',
+    value: 'trainAddress',
+    width: '120',
+  },
+  {
+    text: '培训学时',
+    value: 'trainHour',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'trainPerson',
+    width: '120',
+  },
+  {
+    text: '培训人数',
+    value: 'trainNumber',
+    width: '120',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '180',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    width: '120',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    trainTime: '',
+    createTime: '',
+    logNo: '',
+    trainName: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 导出
+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: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
+      name: '培训计划',
+      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
+      name: '培训计划',
+      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
+  infoId.value = row.id
+  buttonType.value = type
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  isPopconfirmShow.value = true
+  deleteId.value = row.id
+}
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
+  checkoutList.value = e
+}
+const add = () => {
+  infoId.value = ''
+  buttonType.value = '新建'
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const confirmEvent = () => {
+  getListDelete({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() {
+    console.log('正在加载预览窗口！')
+  }, // 预览窗口打开之前的callback
+  previewOpenCallback() {
+    console.log('已经加载完预览窗口，预览打开了！')
+  }, // 预览窗口打开时的callback
+  beforeOpenCallback() {
+    console.log('开始打印之前！')
+  }, // 开始打印之前的callback
+  openCallback() {
+    console.log('执行打印了！')
+  }, // 调用打印时的callback
+  closeCallback() {
+    console.log('关闭了打印工具！')
+  }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() {
+    console.log('点击v-print绑定的按钮了！')
+  },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>培训记录</div>
+  <div v-if="show">
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.logNo"
+            placeholder="培训记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.trainName"
+            placeholder="实施单位"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.trainTime"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+          />
+        </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"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <plan-add
+    v-else :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 41bc72f..667379c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1443,10 +1443,6 @@
     engines: {node: '>=8'}
     dev: true
 
-  /async-validator/4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
-
   /async/2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
     dependencies:
diff --git a/src/api/system/plan.ts b/src/api/system/plan.ts
index c63aef2..8b448cd 100644
--- a/src/api/system/plan.ts
+++ b/src/api/system/plan.ts
@@ -41,7 +41,7 @@
 // 培训计划更新
 export function getListUpdate(data: object) {
   return request({
-    url: `${prefix}/train/log/update`,
+    url: `${prefix}/train/plan/update`,
     method: 'post',
     data,
   })
@@ -54,3 +54,39 @@
     data,
   })
 }
+
+// 培训记录列表
+export function getLogList(data: object) {
+  return request({
+    url: `${prefix}/train/log/listPage?offset=${data.offset}&limit=${data.limit} `,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表编号查询
+export function getPlanIdList(data: object) {
+  return request({
+    url: `${prefix}/train/plan/list`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录新建
+export function getListLogAdd(data: object) {
+  return request({
+    url: `${prefix}/train/log/add`,
+    method: 'post',
+    data,
+  })
+}
+
+// 培训记录详情
+export function getListLogDetail(data: object) {
+  return request({
+    url: `${prefix}/train/log/detail`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a832874..d959c68 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -15,7 +15,6 @@
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
     BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
     ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
-    copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default']
     CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
     Copyright: typeof import('./components/Copyright/index.vue')['default']
     DeptSelect: typeof import('./components/DeptSelect/index.vue')['default']
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 6c88385..136f0a8 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery, IlistType } from './list_interface'
 import ListSourceAdd from './listAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
@@ -65,21 +64,6 @@
   },
 ])
 
-// 表格loding
-const listLoading = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getSoucreList(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData(true)
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -91,6 +75,20 @@
 const isPopconfirmShow = ref(false)
 // 点击按钮
 const buttonType = ref('')
+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
@@ -106,16 +104,6 @@
   isPopconfirmShow.value = true
   deleteId.value = row.id
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -192,6 +180,16 @@
     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()
 }
@@ -232,7 +230,8 @@
   <div v-if="show">
     <app-container>
       <search-area
-        @search="searchList"
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
       >
         <search-item>
           <el-input
@@ -255,11 +254,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="clearList">
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -280,64 +274,43 @@
           </el-button>
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="30" />
-          <el-table-column align="center" label="#" width="30" type="index" />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="200">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
     <el-dialog
       v-model="isPopconfirmShow"
       title="确认框"
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 4273146..a2f21a5 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup name="ListPlan">
 import type { Ref } from 'vue'
 import { reactive, ref } from 'vue'
-import { Delete } from '@element-plus/icons-vue'
 import { ElLoading, ElMessage } from 'element-plus'
 import type { IlistQuery, IlistType } from './plan_interface'
 import PlanAdd from './planAdd.vue'
@@ -25,7 +24,11 @@
 const show = ref(true)
 const infoId = ref('')
 const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
@@ -33,11 +36,11 @@
   getPlanList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
+    loadingTable.value = false
   })
 }
 fetchData(true)
-// 主管部门下拉框
-const options = ref([])
+
 // 表头
 const columns = ref([
   {
@@ -53,14 +56,17 @@
   {
     text: '培训对象',
     value: 'trainPerson',
+    width: '120',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
+    width: '120',
   },
   {
     text: '培训学时',
     value: 'trainHour',
+    width: '120',
   },
   {
     text: '培训时间',
@@ -75,10 +81,12 @@
   {
     text: '实施单位',
     value: 'effectiveCompany',
+    width: '120',
   },
   {
     text: '培训内容',
     value: 'trainContent',
+    width: '120',
   },
   {
     text: '创建时间',
@@ -88,6 +96,7 @@
   {
     text: '备注',
     value: 'remark',
+    width: '120',
   },
 ])
 // 搜索
@@ -116,7 +125,7 @@
   if (checkoutList.value.length <= 0) {
     exportExcel({
       json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -124,7 +133,7 @@
   else {
     exportExcel({
       json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
-      name: '培训计划',
+      name: '培训记录',
       titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
       sheetName: 'sheet1',
     })
@@ -137,6 +146,7 @@
   fetchData(true)
 }
 const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
   infoId.value = row.id
   buttonType.value = type
   show.value = false
@@ -148,18 +158,9 @@
 }
 const handelClick = (text: string) => {}
 const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
   checkoutList.value = e
 }
-// 分页
-const handleSizeChange = (val: number) => {
-  listQuery.value.limit = val
-  fetchData(true)
-}
-// 分页
-const handleCurrentChange = (val: number) => {
-  listQuery.value.offset = val
-  fetchData(true)
-}
 const add = () => {
   infoId.value = ''
   buttonType.value = '新建'
@@ -188,6 +189,16 @@
     }
   })
 }
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
   id: 'print', // 需要打印元素的id
@@ -220,7 +231,7 @@
 <template>
   <div v-if="show">
     <app-container>
-      <search-area @search="searchList">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
             v-model="listQuery.trainTime"
@@ -268,17 +279,6 @@
             clearable
           />
         </search-item>
-        <template #btns>
-          <el-button
-            class="filter-item"
-            type="info"
-            :icon="Delete"
-            :style="{ marginTop: '-10px' }"
-            @click="clearList"
-          >
-            重置
-          </el-button>
-        </template>
       </search-area>
       <table-container>
         <template #btns-right>
@@ -292,76 +292,50 @@
             打印
           </el-button>
         </template>
-        <el-table
-          id="print"
-          :data="list"
-          style="width: 100%;"
-          @selection-change="handleSelectionChange"
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            align="center"
-            label="序号"
-            width="80"
-            type="index"
-          />
-          <el-table-column
-            v-for="(column, index) in columns"
-            :key="index"
-            :label="column.text"
-            :prop="column.value"
-            :width="column.width"
-            align="center"
-          />
-          <el-table-column align="center" label="操作" width="240">
-            <template #default="scope">
-              <el-button
-                size="small"
-                type="primary"
-                link
-                @click="handleEdit(scope.$index, scope.row, '编辑')"
-              >
-                编辑
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-                @click="handleEdit(scope.$index, scope.row, '详情')"
-              >
-                详情
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="danger"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-                删除
-              </el-button>
-              <el-button
-                size="small"
-                link
-                type="primary"
-              >
-                二维码
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <template #columns>
+            <el-table-column label="操作" align="center" width="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                >
+                  二维码
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
       </table-container>
     </app-container>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="listQuery.offset"
-        v-model:page-size="listQuery.limit"
-        :page-sizes="[10, 20, 30, 50]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
   </div>
   <plan-add
     v-else :info-id="infoId"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index ac8d85d..2ce01d7 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -1,5 +1,10 @@
 <script lang="ts" setup name="PlanAdd">
-import { getDeptTree, getListAdd, getListDetail, getListUpdate } from '@/api/system/plan'
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
 
 const props = defineProps({
   infoId: {
@@ -36,7 +41,7 @@
   { text: '学员名称', value: 'name' },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -100,11 +105,23 @@
 }
 const getAddList = (buttonType: string) => {
   if (buttonType === '提交' && props.buttonType !== '编辑') {
-    getListAdd(formInline.value).then((res) => {})
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
     formInline.value.id = props.infoId
-    getListUpdate(formInline.value).then((res) => {})
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
   }
   else {
     // 打印
@@ -313,13 +330,24 @@
       :model="addPersonList"
       style="max-width: 460px;"
     >
-      <el-form-item
-        v-for="column in columns"
-        :key="column.value"
-        :label="column.text"
-        :prop="addPersonList[column.value]"
-      >
-        <el-input v-model="addPersonList[column.value]" />
+      <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="buttonType === '详情'"
+        />
       </el-form-item>
     </el-form>
     <el-button type="primary" class="dialog-button" @click="addPushList">
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2010edd..6524e67 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -24,3 +24,28 @@
   trainTime: string
 }
 
+export interface IlistQuerys {
+  trainTime: string
+  createTime: string
+  logNo: string
+  trainName: string
+  offset: number
+  limit: number
+}
+
+export interface IlistTypes {
+  createTime: string
+  deptName: string
+  director: string
+  effectiveCompany: string
+  planName: string
+  planNo: string
+  remark: string
+  trainAddress: string
+  trainContent: string
+  trainHour: string
+  trainNumber: number
+  trainPerson: string
+  trainTime: string
+}
+
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f87a4a5..56b2ec7 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -1,3 +1,316 @@
+<script lang="ts" setup name="ListPlan">
+import type { Ref } from 'vue'
+import { reactive, ref } from 'vue'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { IlistQuerys, IlistTypes } from './plan_interface'
+import PlanAdd from './trainLogAdd.vue'
+import { exportExcel } from '@/utils/exportXlsx'
+import { getDeptTree, getListDelete, getLogList } from '@/api/system/plan'
+const listQuery: Ref<IlistQuerys> = ref({
+  trainTime: '',
+  createTime: '',
+  logNo: '',
+  trainName: '',
+  offset: 1,
+  limit: 10,
+})
+const checkoutList = ref([])
+const list = ref([])
+// 删除id
+const deleteId = ref('')
+const isPopconfirmShow = ref(false)
+const total = ref(0)
+const show = ref(true)
+const infoId = ref('')
+const buttonType = ref('')
+// 主管部门下拉框
+const options = ref([])
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getLogList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+
+// 表头
+const columns = ref([
+  {
+    text: '记录编号',
+    value: 'logNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'trainName',
+    width: '120',
+  },
+  {
+    text: '培训时间',
+    value: 'trainTime',
+    width: '120',
+  },
+  {
+    text: '培训地点',
+    value: 'trainAddress',
+    width: '120',
+  },
+  {
+    text: '培训学时',
+    value: 'trainHour',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'trainPerson',
+    width: '120',
+  },
+  {
+    text: '培训人数',
+    value: 'trainNumber',
+    width: '120',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    width: '180',
+  },
+  {
+    text: '备注',
+    value: 'remark',
+    width: '120',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    trainTime: '',
+    createTime: '',
+    logNo: '',
+    trainName: '',
+    offset: 1,
+    limit: 10,
+  }
+}
+// 导出
+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: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
+      name: '培训计划',
+      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  else {
+    exportExcel({
+      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, planNo: item.planNo, planName: item.planName, trainPerson: item.trainPerson, trainNumber: item.trainNumber, trainHour: item.trainHour, trainTime: item.trainTime, deptName: item.deptName, effectiveCompany: item.effectiveCompany, director: item.director, trainContent: item.trainContent, createTime: item.createTime, remark: item.remark })),
+      name: '培训计划',
+      titleArr: ['序号', '培训计划编号', '培训名称', '培训对象', '培训人数', '培训学时', '培训时间', '主管部门', '实施单位', '负责人', '培训内容', '创建时间', '备注'],
+      sheetName: 'sheet1',
+    })
+  }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+const handleEdit = (index: string, row: object, type: string) => {
+  console.log(row)
+  infoId.value = row.id
+  buttonType.value = type
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  isPopconfirmShow.value = true
+  deleteId.value = row.id
+}
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  console.log(e, '666')
+  checkoutList.value = e
+}
+const add = () => {
+  infoId.value = ''
+  buttonType.value = '新建'
+  show.value = false
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const confirmEvent = () => {
+  getListDelete({ id: deleteId.value }).then((res) => {
+    if (res.code === 200) {
+      isPopconfirmShow.value = false
+      fetchData(true)
+    }
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '证书报告模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() {
+    console.log('正在加载预览窗口！')
+  }, // 预览窗口打开之前的callback
+  previewOpenCallback() {
+    console.log('已经加载完预览窗口，预览打开了！')
+  }, // 预览窗口打开时的callback
+  beforeOpenCallback() {
+    console.log('开始打印之前！')
+  }, // 开始打印之前的callback
+  openCallback() {
+    console.log('执行打印了！')
+  }, // 调用打印时的callback
+  closeCallback() {
+    console.log('关闭了打印工具！')
+  }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() {
+    console.log('点击v-print绑定的按钮了！')
+  },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
 <template>
-  <div>培训记录</div>
+  <div v-if="show">
+    <app-container>
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.logNo"
+            placeholder="培训记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.trainName"
+            placeholder="实施单位"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.trainTime"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+          />
+        </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"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="add">
+            批量导入
+          </el-button>
+          <el-button type="primary" @click="add">
+            模板下载
+          </el-button>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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="250">
+              <template #default="{ row }">
+                <el-button
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row.$index, row, '编辑')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row.$index, row, '详情')"
+                >
+                  详情
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <plan-add
+    v-else :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
 </template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
new file mode 100644
index 0000000..f180b1a
--- /dev/null
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -0,0 +1,448 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getListDetail,
+  getListLogAdd,
+  getListLogDetail,
+  getListUpdate,
+  getPlanIdList,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  improveMethod: '',
+  logNo: '',
+  preparer: '',
+  problems: '',
+  planId: '',
+  remark: '',
+  trainAddress: '',
+  trainContent: '',
+  trainEffect: '',
+  trainHour: '',
+  trainName: '',
+  trainNumber: '',
+  trainPerson: '',
+  trainStaffList: [],
+  trainTime: '',
+})
+// 主管部门下拉框
+const options = ref([])
+const dialogVisible = ref(false)
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime' },
+  { text: '考核结果', value: 'examResult' },
+]
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  name: '',
+  remark: '',
+  signTime: '',
+  technologyJob: '',
+  planId: 0,
+  staffId: 0,
+})
+const SelectionList = ref([])
+const ListDetail = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    createTime: '',
+    deptId: 0,
+    director: '',
+    effectiveCompany: '',
+    trainTime: '',
+  }
+  getPlanIdList(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+const selectChange = (e: any) => {
+  const id = options.value.filter(item => item.id === e)[0].id
+  getListDetail({ id }).then((res) => {
+    ListDetail.value = res.data.trainStaffList
+    formInline.value = { ...res.data }
+    formInline.value.planId = e
+  })
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+const addPersonListChange = (e: any) => {
+  addPersonList.value = ListDetail.value.filter(item => item.staffId === e)[0]
+}
+if (props.infoId && props.infoId !== '') {
+  getListLogDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListLogAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        新建培训记录
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="编号:">
+          <el-input
+            v-model="formInline.logNo"
+            placeholder="请输入编号"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="填表人:">
+          <el-input
+            v-model="formInline.preparer"
+            placeholder="请输入填表人"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="创建时间:">
+          <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="buttonType === '详情'"
+            />
+        </el-form-item> -->
+        <span v-if="infoId === ''">
+          <el-form-item label="计划编号:">
+            <el-select
+              v-model="formInline.planName"
+              clearable
+              placeholder="计划编号"
+              size="default"
+              :disabled="buttonType === '详情'"
+              @change="selectChange"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.planName"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </span>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.trainName"
+            placeholder="请输入培训名称"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            placeholder="请输入培训对象"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            placeholder="请输入培训人数"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训学时:">
+          <el-input
+            v-model="formInline.trainHour"
+            placeholder="请输入培训学时"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训时间:">
+          <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="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            placeholder="请输入培训地点"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <div class="input-width">
+          <el-form-item label="培训效果:">
+            <el-input
+              v-model="formInline.trainEffect"
+              placeholder="请输入培训效果"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="存在问题:">
+            <el-input
+              v-model="formInline.problems"
+              placeholder="请输入存在问题"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="改进措施:">
+            <el-input
+              v-model="formInline.improveMethod"
+              placeholder="请输入改进措施"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              placeholder="请输入备注"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <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>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-select
+          v-model="addPersonList.planId"
+          clearable
+          placeholder="计划编号"
+          size="default"
+          :disabled="buttonType === '详情'"
+          @change="addPersonListChange"
+        >
+          <el-option
+            v-for="item in ListDetail"
+            :key="item.id"
+            :label="item.name"
+            :value="item.staffId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="考核结果">
+        <el-input v-model="addPersonList.examResult" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 10px;
+  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>