diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
index 982c2ae..b037d2d 100644
--- a/src/views/measure/train/components/planListDialog.vue
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -127,7 +127,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择培训计划">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="65%" title="选择培训计划">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
index 982c2ae..b037d2d 100644
--- a/src/views/measure/train/components/planListDialog.vue
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -127,7 +127,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择培训计划">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="65%" title="选择培训计划">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 46e460b..bcf4d03 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -1,12 +1,12 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectMeasurePersonDialog">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,12 +29,12 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
-  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
@@ -50,16 +50,22 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
+  loadingTable.value = true
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records.map((item: any) => {
         return {
           ...item,
           sex: item.sex === '1' ? '男' : '女',
+          technologyExam: item.technologyExam == '0' ? '已考核' : '未考核',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
         }
       })
       total.value = parseInt(res.data.total)
+      loadingTable.value = false
     }
+  }).catch(() => {
+    loadingTable.value = false
   })
 }
 // 搜索
@@ -118,7 +124,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
index 982c2ae..b037d2d 100644
--- a/src/views/measure/train/components/planListDialog.vue
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -127,7 +127,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择培训计划">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="65%" title="选择培训计划">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 46e460b..bcf4d03 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -1,12 +1,12 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectMeasurePersonDialog">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,12 +29,12 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
-  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
@@ -50,16 +50,22 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
+  loadingTable.value = true
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records.map((item: any) => {
         return {
           ...item,
           sex: item.sex === '1' ? '男' : '女',
+          technologyExam: item.technologyExam == '0' ? '已考核' : '未考核',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
         }
       })
       total.value = parseInt(res.data.total)
+      loadingTable.value = false
     }
+  }).catch(() => {
+    loadingTable.value = false
   })
 }
 // 搜索
@@ -118,7 +124,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index e8b4a37..a83a8a3 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -16,10 +16,10 @@
   getListUpdate,
 } from '@/api/measure/plan'
 const infoId = ref('') // id
-const from = ref('') // reject表示未通过驳回跳转过来的
 const userVisible = ref(false) // 控制选择用户弹框显隐
 const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
+const approvalStatusName = ref('') // 审批状态名称
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -51,10 +51,10 @@
 const ruleFormRef = ref<FormInstance>() // 表单ref
 // 人员信息表头
 const columns = [
-  { text: '学员名称', value: 'name' },
+  { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime', width: '180' },
+  { text: '签到时间', value: 'signTime', width: '180' },
 ]
 const dialogVisible = ref(false)
 const SelectionList = ref<IaddPersonListType[]>([])
@@ -75,6 +75,7 @@
   trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
+// ------------------------------------路由参数-------------------------------------------
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -82,13 +83,8 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
-  if ($route.query.from) {
-    from.value = $route.query.from as string
-  }
-  if ($route.query.processId) {
-    processId.value = $route.query.processId as string
-  }
 }
+// -----------------------------------------------------------------------------------
 
 // 初始化router
 const $router = useRouter()
@@ -106,7 +102,7 @@
 const addRow = () => {
   const index = formInline.value.trainStaffList.findIndex(item => !item.name)
   if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
+    ElMessage.warning('请完善上一条人员信息')
     return
   }
   if (formInline.value) {
@@ -133,10 +129,6 @@
   listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
 
 // 删除行
 const deleteList = () => {
@@ -162,10 +154,17 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
-  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
-  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
-  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+  const index = formInline.value.trainStaffList.findIndex(item => item.staffId === val[0].id)
+  if (index === -1) {
+    formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+    formInline.value.trainStaffList[listIndex.value].company = val[0].deptName // 单位名称
+    formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+    formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+    formInline.value.trainStaffList[listIndex.value].planId = infoId.value // 培训计划表id
+  }
+  else {
+    ElMessage.warning('此人员已添加过')
+  }
 }
 // 点击提交
 const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
@@ -207,7 +206,7 @@
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   const trainStaffList = formInline.value.trainStaffList.filter(item => item.name)
   if (!trainStaffList.length) {
     ElMessage.warning('培训人员不能为空')
@@ -222,12 +221,13 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        if (pageType.value === 'edit') {
-          // 未通过-驳回编辑
-          if (from.value === 'reject') {
-            formInline.value.processId = processId.value
-            formInline.value.trainNumber = parseInt(formInline.value.trainNumber)
+        if (pageType.value === 'edit') { // 编辑
+          console.log('ppppppp---------', approvalStatusName.value)
 
+          // 未通过-驳回编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            formInline.value.processId = processId.value
+            formInline.value.trainNumber = parseInt(formInline.value.trainNumber as string)
             getListFailUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -236,7 +236,7 @@
               }
             })
           }
-          else {
+          else { // 草稿箱、已取消
             getListDraftUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -245,24 +245,6 @@
               }
             })
           }
-          // else if (from.value === 'caogao') { // 草稿箱编辑
-          //   getListDraftUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
-          // else {
-          //   getListUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
         }
         else if (pageType.value === 'add') { // 新建
           getListSave(formInline.value).then((res) => {
@@ -285,6 +267,10 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+})
 </script>
 
 <template>
@@ -298,18 +284,10 @@
         >
           提交
         </el-button> -->
-        <el-button
-          v-if="pageType === 'detail'"
-          v-print="printObj"
-          type="primary"
-        >
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="preserve(ruleFormRef)"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -453,6 +431,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
                 :disabled="pageType === 'detail'"
               />
@@ -485,6 +465,9 @@
           :label="item.text"
           align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
             <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
               <template #append>

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
index 982c2ae..b037d2d 100644
--- a/src/views/measure/train/components/planListDialog.vue
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -127,7 +127,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择培训计划">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="65%" title="选择培训计划">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 46e460b..bcf4d03 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -1,12 +1,12 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectMeasurePersonDialog">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,12 +29,12 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
-  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
@@ -50,16 +50,22 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
+  loadingTable.value = true
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records.map((item: any) => {
         return {
           ...item,
           sex: item.sex === '1' ? '男' : '女',
+          technologyExam: item.technologyExam == '0' ? '已考核' : '未考核',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
         }
       })
       total.value = parseInt(res.data.total)
+      loadingTable.value = false
     }
+  }).catch(() => {
+    loadingTable.value = false
   })
 }
 // 搜索
@@ -118,7 +124,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index e8b4a37..a83a8a3 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -16,10 +16,10 @@
   getListUpdate,
 } from '@/api/measure/plan'
 const infoId = ref('') // id
-const from = ref('') // reject表示未通过驳回跳转过来的
 const userVisible = ref(false) // 控制选择用户弹框显隐
 const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
+const approvalStatusName = ref('') // 审批状态名称
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -51,10 +51,10 @@
 const ruleFormRef = ref<FormInstance>() // 表单ref
 // 人员信息表头
 const columns = [
-  { text: '学员名称', value: 'name' },
+  { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime', width: '180' },
+  { text: '签到时间', value: 'signTime', width: '180' },
 ]
 const dialogVisible = ref(false)
 const SelectionList = ref<IaddPersonListType[]>([])
@@ -75,6 +75,7 @@
   trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
+// ------------------------------------路由参数-------------------------------------------
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -82,13 +83,8 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
-  if ($route.query.from) {
-    from.value = $route.query.from as string
-  }
-  if ($route.query.processId) {
-    processId.value = $route.query.processId as string
-  }
 }
+// -----------------------------------------------------------------------------------
 
 // 初始化router
 const $router = useRouter()
@@ -106,7 +102,7 @@
 const addRow = () => {
   const index = formInline.value.trainStaffList.findIndex(item => !item.name)
   if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
+    ElMessage.warning('请完善上一条人员信息')
     return
   }
   if (formInline.value) {
@@ -133,10 +129,6 @@
   listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
 
 // 删除行
 const deleteList = () => {
@@ -162,10 +154,17 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
-  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
-  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
-  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+  const index = formInline.value.trainStaffList.findIndex(item => item.staffId === val[0].id)
+  if (index === -1) {
+    formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+    formInline.value.trainStaffList[listIndex.value].company = val[0].deptName // 单位名称
+    formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+    formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+    formInline.value.trainStaffList[listIndex.value].planId = infoId.value // 培训计划表id
+  }
+  else {
+    ElMessage.warning('此人员已添加过')
+  }
 }
 // 点击提交
 const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
@@ -207,7 +206,7 @@
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   const trainStaffList = formInline.value.trainStaffList.filter(item => item.name)
   if (!trainStaffList.length) {
     ElMessage.warning('培训人员不能为空')
@@ -222,12 +221,13 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        if (pageType.value === 'edit') {
-          // 未通过-驳回编辑
-          if (from.value === 'reject') {
-            formInline.value.processId = processId.value
-            formInline.value.trainNumber = parseInt(formInline.value.trainNumber)
+        if (pageType.value === 'edit') { // 编辑
+          console.log('ppppppp---------', approvalStatusName.value)
 
+          // 未通过-驳回编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            formInline.value.processId = processId.value
+            formInline.value.trainNumber = parseInt(formInline.value.trainNumber as string)
             getListFailUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -236,7 +236,7 @@
               }
             })
           }
-          else {
+          else { // 草稿箱、已取消
             getListDraftUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -245,24 +245,6 @@
               }
             })
           }
-          // else if (from.value === 'caogao') { // 草稿箱编辑
-          //   getListDraftUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
-          // else {
-          //   getListUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
         }
         else if (pageType.value === 'add') { // 新建
           getListSave(formInline.value).then((res) => {
@@ -285,6 +267,10 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+})
 </script>
 
 <template>
@@ -298,18 +284,10 @@
         >
           提交
         </el-button> -->
-        <el-button
-          v-if="pageType === 'detail'"
-          v-print="printObj"
-          type="primary"
-        >
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="preserve(ruleFormRef)"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -453,6 +431,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
                 :disabled="pageType === 'detail'"
               />
@@ -485,6 +465,9 @@
           :label="item.text"
           align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
             <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
               <template #append>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2f21228..bb329e1 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -36,6 +36,7 @@
   taskId?: string // 任务id
   trainTime: string // 培训时间
   approvalStatusName: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 下拉框类型
 export interface IOptions {
@@ -124,6 +125,7 @@
   technologyJob: string // 技术职称
   updateTime?: string // 更新时间
   createTime?: string // 创建时间
+  planId?: string // 培训计划表id
 }
 
 export interface IformInlineType {
@@ -139,7 +141,7 @@
   trainAddress: string // 培训地点
   trainContent: string // 培训内容
   trainHour: string // 培训学时
-  trainNumber: string // 培训人数
+  trainNumber: string | number // 培训人数
   trainPerson: string // 培训人员
   trainStaffList: IaddPersonListType[] // 人员信息
   trainTime: string // 培训时间

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
index 982c2ae..b037d2d 100644
--- a/src/views/measure/train/components/planListDialog.vue
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -127,7 +127,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择培训计划">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="65%" title="选择培训计划">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 46e460b..bcf4d03 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -1,12 +1,12 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectMeasurePersonDialog">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,12 +29,12 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
-  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
@@ -50,16 +50,22 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
+  loadingTable.value = true
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records.map((item: any) => {
         return {
           ...item,
           sex: item.sex === '1' ? '男' : '女',
+          technologyExam: item.technologyExam == '0' ? '已考核' : '未考核',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
         }
       })
       total.value = parseInt(res.data.total)
+      loadingTable.value = false
     }
+  }).catch(() => {
+    loadingTable.value = false
   })
 }
 // 搜索
@@ -118,7 +124,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index e8b4a37..a83a8a3 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -16,10 +16,10 @@
   getListUpdate,
 } from '@/api/measure/plan'
 const infoId = ref('') // id
-const from = ref('') // reject表示未通过驳回跳转过来的
 const userVisible = ref(false) // 控制选择用户弹框显隐
 const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
+const approvalStatusName = ref('') // 审批状态名称
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -51,10 +51,10 @@
 const ruleFormRef = ref<FormInstance>() // 表单ref
 // 人员信息表头
 const columns = [
-  { text: '学员名称', value: 'name' },
+  { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime', width: '180' },
+  { text: '签到时间', value: 'signTime', width: '180' },
 ]
 const dialogVisible = ref(false)
 const SelectionList = ref<IaddPersonListType[]>([])
@@ -75,6 +75,7 @@
   trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
+// ------------------------------------路由参数-------------------------------------------
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -82,13 +83,8 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
-  if ($route.query.from) {
-    from.value = $route.query.from as string
-  }
-  if ($route.query.processId) {
-    processId.value = $route.query.processId as string
-  }
 }
+// -----------------------------------------------------------------------------------
 
 // 初始化router
 const $router = useRouter()
@@ -106,7 +102,7 @@
 const addRow = () => {
   const index = formInline.value.trainStaffList.findIndex(item => !item.name)
   if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
+    ElMessage.warning('请完善上一条人员信息')
     return
   }
   if (formInline.value) {
@@ -133,10 +129,6 @@
   listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
 
 // 删除行
 const deleteList = () => {
@@ -162,10 +154,17 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
-  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
-  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
-  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+  const index = formInline.value.trainStaffList.findIndex(item => item.staffId === val[0].id)
+  if (index === -1) {
+    formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+    formInline.value.trainStaffList[listIndex.value].company = val[0].deptName // 单位名称
+    formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+    formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+    formInline.value.trainStaffList[listIndex.value].planId = infoId.value // 培训计划表id
+  }
+  else {
+    ElMessage.warning('此人员已添加过')
+  }
 }
 // 点击提交
 const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
@@ -207,7 +206,7 @@
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   const trainStaffList = formInline.value.trainStaffList.filter(item => item.name)
   if (!trainStaffList.length) {
     ElMessage.warning('培训人员不能为空')
@@ -222,12 +221,13 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        if (pageType.value === 'edit') {
-          // 未通过-驳回编辑
-          if (from.value === 'reject') {
-            formInline.value.processId = processId.value
-            formInline.value.trainNumber = parseInt(formInline.value.trainNumber)
+        if (pageType.value === 'edit') { // 编辑
+          console.log('ppppppp---------', approvalStatusName.value)
 
+          // 未通过-驳回编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            formInline.value.processId = processId.value
+            formInline.value.trainNumber = parseInt(formInline.value.trainNumber as string)
             getListFailUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -236,7 +236,7 @@
               }
             })
           }
-          else {
+          else { // 草稿箱、已取消
             getListDraftUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -245,24 +245,6 @@
               }
             })
           }
-          // else if (from.value === 'caogao') { // 草稿箱编辑
-          //   getListDraftUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
-          // else {
-          //   getListUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
         }
         else if (pageType.value === 'add') { // 新建
           getListSave(formInline.value).then((res) => {
@@ -285,6 +267,10 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+})
 </script>
 
 <template>
@@ -298,18 +284,10 @@
         >
           提交
         </el-button> -->
-        <el-button
-          v-if="pageType === 'detail'"
-          v-print="printObj"
-          type="primary"
-        >
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="preserve(ruleFormRef)"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -453,6 +431,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
                 :disabled="pageType === 'detail'"
               />
@@ -485,6 +465,9 @@
           :label="item.text"
           align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
             <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
               <template #append>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2f21228..bb329e1 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -36,6 +36,7 @@
   taskId?: string // 任务id
   trainTime: string // 培训时间
   approvalStatusName: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 下拉框类型
 export interface IOptions {
@@ -124,6 +125,7 @@
   technologyJob: string // 技术职称
   updateTime?: string // 更新时间
   createTime?: string // 创建时间
+  planId?: string // 培训计划表id
 }
 
 export interface IformInlineType {
@@ -139,7 +141,7 @@
   trainAddress: string // 培训地点
   trainContent: string // 培训内容
   trainHour: string // 培训学时
-  trainNumber: string // 培训人数
+  trainNumber: string | number // 培训人数
   trainPerson: string // 培训人员
   trainStaffList: IaddPersonListType[] // 人员信息
   trainTime: string // 培训时间
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 2c9e9d0..5d9aac5 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -56,7 +56,7 @@
   { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company', required: true },
   { text: '技术职称', value: 'technologyJob', required: true },
-  { text: '签到时间', value: 'signTime', width: '180', required: true },
+  { text: '签到时间', value: 'signTime', width: '180', required: false },
   { text: '考核结果', value: 'examResult', required: true },
 ])
 // 校验规则
@@ -476,7 +476,7 @@
             <!-- <el-input v-if="item.text === '考核结果' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" /> -->
 
             <el-select
-              v-if="item.text === '考核结果' && pageType === 'edit'"
+              v-if="item.text === '考核结果' && (pageType === 'edit' || pageType === 'add')"
               v-model="scope.row.examResult"
               placeholder="请选择考核结果"
             >

diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index a9841f0..f01ec20 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -132,9 +132,9 @@
   })
 }
 // 工作培训记录
-export function getStaffCultivateLog(data: { id: string }) {
+export function getStaffCultivateLog(data: { id: string; offset: number; limit: number }) {
   return request({
-    url: '/staff/staffCultivateLog',
+    url: `/staff/staffCultivateLog?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
     data,
   })
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index b3c1920..25e9c05 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -127,6 +127,19 @@
   fetchData(true)
 }
 
+// 重置
+const reset = () => {
+  listQuery.keywords = ''
+  listQuery.beginTime = ''
+  listQuery.endTime = ''
+  listQuery.deptId = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  listQuery.sort = 'id'
+  listQuery.deptType = ''
+  search()
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -146,11 +159,11 @@
 
 <template>
   <div class="select-emplotees-dialog">
-    <el-dialog v-model="visibleDialog" title="选择成员" max-width="80%" append-to-body custom-class="chengyuan-dialog promoter_person">
+    <el-dialog v-model="visibleDialog" title="选择成员" width="65%" append-to-body custom-class="chengyuan-dialog promoter_person">
       <!-- 右侧表格 -->
       <div ref="tableContainer" class="table-area">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input v-model.trim="listQuery.keywords" placeholder="账户/真实姓名/手机号" clearable />
           </search-item>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 17b4732..aa5209d 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -92,7 +92,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('reportOnCredentialsApproval', newValue)
+  window.sessionStorage.setItem('reportOnCredentialsApproval', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index 5a76153..68de93c 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -105,7 +105,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceCheckListMenu', newValue)
+  window.sessionStorage.setItem('maintenceCheckListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index a7b8437..2897c5c 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -98,7 +98,7 @@
 
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
-  window.sessionStorage.setItem('maintenceListMenu', newValue)
+  window.sessionStorage.setItem('maintenceListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
 }, { deep: true })
 </script>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index 3f75ec2..fd47df7 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -9,6 +9,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { getpDeptApi, listPageApi, meterEquipmentByDeptId, standardlistPageApi, updateApi } from '@/api/measure/measureDept'
 import type { dictType } from '@/global'
+
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index 85fdc44..560171d 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -1,4 +1,4 @@
-<!-- 证书记录 -->
+<!-- 证书记录列表 -->
 <script lang="ts" setup name="person">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { StaffListType, StaffType } from './person-interface'
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 180e744..8f7e5b9 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -1,7 +1,7 @@
 <!-- 计量人员新增 -->
 <script lang="ts" setup name="addNotice">
 import type { FormInstance, FormRules, UploadProps, UploadUserFile } from 'element-plus'
-import { ElMessage, ElMessageBox, ElTable } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, ElTable } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import lodash from 'lodash'
 import dayjs from 'dayjs'
@@ -16,6 +16,8 @@
 import { getStaffAdd, getStaffCultivateLog, getStaffDetail, getStaffupdate } from '@/api/measure/person'
 import { getPhotoUrl } from '@/api/system/tool'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import type { dictType } from '@/global'
+
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const $route = useRoute()
 const $router = useRouter()
@@ -160,7 +162,17 @@
     administrationJobList.value = response.data
   })
 }
-// --------------------------------------------------------------------------------------
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+
+// ---------------------------------------选择人员-----------------------------------------------
 const userListRef = ref()
 // 选择人员
 const selectPerson = () => {
@@ -176,16 +188,25 @@
   ruleForm.value.deptId = row.deptId
   ruleFormRef.value?.clearValidate('name')
 }
+// ---------------------------------------------------------------------------------------
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
       ElMessage.success('上传成功')
       ruleForm.value.minioFileName = res.data[0]
+      loading.close()
     }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
   })
 }
 // 上传之前的验证
@@ -200,6 +221,7 @@
   }
   return true
 }
+// -------------------------------------------表格---------------------------------------
 interface certificateType {
   certificateNo: string // 证书号
   certificateName: string // 证书名称
@@ -274,14 +296,14 @@
         text: '发证日期',
         value: 'certificateDate',
         id: 'certificateDate',
-        width: '120',
+        width: '170',
         required: true,
         isDate: true, // 是否日期
       },
       {
         text: '有效日期',
         value: 'validDate',
-        width: '120',
+        width: '170',
         id: 'validDate',
         required: true,
         isDate: true, // 是否日期
@@ -308,13 +330,13 @@
         required: false,
         isDate: false, // 是否日期
       },
-      {
-        text: '类别',
-        value: 'a3',
-        id: 'zs03',
-        required: false,
-        isSelect: true, // 是否下拉框
-      },
+      // {
+      //   text: '类别',
+      //   value: 'a3',
+      //   id: 'zs03',
+      //   required: false,
+      //   isSelect: true, // 是否下拉框
+      // },
       {
         text: '计划编号',
         value: 'planNo',
@@ -400,16 +422,41 @@
 const currentShow = computed(() => {
   return changeList.value.filter(item => item.name === current.value)[0]
 })
+const listQuery = ref({
+  limit: 10,
+  offset: 1,
+})
+const total = ref()
+// 获取工作培训记录
+const fetchStaffCultivateLog = () => {
+  const param = {
+    id: infoId.value,
+    ...listQuery.value,
+  }
+  getStaffCultivateLog(param).then((res) => {
+    changeList.value[1].data = res.data.rows
+    total.value = res.data.total
+  })
+}
 watch(current, () => {
   if (current.value === '计量工作培训记录') {
-    getStaffCultivateLog({ id: infoId.value }).then((res) => {
-      changeList.value[1].data = res.data.rows
-    })
+    // 获取工作培训记录
+    fetchStaffCultivateLog()
   }
   // if (current.value === '业务记录') {
   //   console.log('暂时没有接口')
   // }
 })
+// 改变页容量
+function handleSizeChange(val: number) {
+  listQuery.value.limit = val
+  fetchStaffCultivateLog()
+}
+// 改变当前页
+function handleCurrentChange(val: number) {
+  listQuery.value.offset = val
+  fetchStaffCultivateLog()
+}
 // 检查证书列表
 function checkCertificateList() {
   for (let index = 0; index < changeList.value[0].data.length; index++) {
@@ -457,6 +504,7 @@
     return !SelectionList.value.includes(item)
   })
 }
+// -----------------------------------------------------------------------------------
 // 处理编辑记录的函数
 const handleRecord = (initData: any[], finalData: any[]) => {
   const certificateList = [] as any[]
@@ -734,7 +782,20 @@
               <dept-select v-model="ruleForm.deptId" :data="PubListTree" :placeholder="title === '详情' ? ' ' : '选择组织机构'" :disabled="title === '详情'" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="计量专业" prop="major" class="marg-item">
-              <el-input v-model.trim="ruleForm.major" placeholder="计量专业" :disabled="title === '详情'" />
+              <el-select
+                v-model.trim="ruleForm.major"
+                clearable
+                :placeholder="title === '详情' ? '' : '请选择'"
+                :disabled="title === '详情'"
+                class="full-width-input"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="是否特操人" prop="specialOperator" class="marg-item">
               <el-select v-model="ruleForm.specialOperator" placeholder="是否特操人" :disabled="title === '详情'" style="width: 100%;">
@@ -818,16 +879,28 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-if="scope.row.editable && !item.isDate" v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="(title === '新建' || title === '编辑') && !item.isDate" v-model="scope.row[item.value]" class="full-width-input" type="textarea" autosize :autofocus="true" :placeholder="`${item.text}`" />
             <el-date-picker
-              v-if="scope.row.editable && item.isDate"
-              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+              v-if="title !== '详情' && item.isDate"
+              v-model="scope.row[item.value]" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
               :placeholder="`${item.text}`"
+              class="full-width-input"
             />
+            <span v-if="title === '详情'">{{ scope.row[item.value] }}</span>
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="current !== '证书基本信息' && title === '详情'" style="width: 100%;margin-top: 10px;">
+        <el-pagination
+          :current-page="listQuery.offset"
+          :page-sizes="[10, 20, 30]"
+          :page-size="listQuery.limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
     <user-list-dialog ref="userListRef" :need-admin="false" @add="confirmPerson" />
diff --git a/src/views/measure/person/components/userListDialog.vue b/src/views/measure/person/components/userListDialog.vue
index 02672dc..08a1e11 100644
--- a/src/views/measure/person/components/userListDialog.vue
+++ b/src/views/measure/person/components/userListDialog.vue
@@ -54,8 +54,18 @@
         total.value = res.data.total
       }
       else {
-        list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
-        total.value = res.data.total - 1
+        // 把超级管理员剔除
+        // list.value = res.data.rows.filter((item: any) => item.account !== 'admin')
+        // total.value = res.data.total - 1
+
+        // 展示超级管理员、但禁止选择
+        list.value = res.data.rows.map((item: { isRadioDisabled: boolean; account: string }) => {
+          if (item.account === 'admin') {
+            item.isRadioDisabled = true
+          }
+          return item
+        })
+        total.value = res.data.total
       }
     }
   })
@@ -144,7 +154,7 @@
           </el-table-column>
           <el-table-column label="" width="55" align="center">
             <template #default="scope">
-              <el-radio v-model="select" :label="scope.$index" class="radio" />
+              <el-radio v-model="select" :label="scope.$index" :disabled="scope.row.isRadioDisabled" class="radio" />
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index 1636ee9..64824df 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -9,6 +9,8 @@
 import { printJSON } from '@/utils/printUtils'
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
+import { getDictByCode } from '@/api/system/dict'
+import type { dictType } from '@/global'
 // import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
 import { toTreeList } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
@@ -32,7 +34,7 @@
   { text: '姓名', value: 'name', align: 'center' },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
   { text: '技术职务', value: 'technologyJob', align: 'center' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
@@ -42,6 +44,15 @@
 ]) // 表格
 
 const list = ref([]) // 表格数据
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+
 // 获取所有部门
 const deptList = ref([])
 const getDeptList = async () => {
@@ -262,7 +273,8 @@
 const batchImport = () => {
   fileRef.value.click()
 }
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   getDeptList()
   getList()
 })
@@ -296,7 +308,9 @@
           <dept-select v-model="searchQuery.deptId" :data="deptList" placeholder="工作部门" />
         </search-item>
         <search-item>
-          <el-input v-model="searchQuery.major" placeholder="计量专业" clearable class="w-50 m-2" />
+          <el-select v-model="searchQuery.major" placeholder="计量专业" clearable>
+            <el-option v-for="item in measureMajorList" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </search-item>
         <search-item>
           <el-input v-model="searchQuery.verifierCertificateNo" placeholder="证书号" clearable class="w-50 m-2" />
diff --git a/src/views/measure/train/components/baseinfoDetail.vue b/src/views/measure/train/components/baseinfoDetail.vue
index f979c5d..aed1b93 100644
--- a/src/views/measure/train/components/baseinfoDetail.vue
+++ b/src/views/measure/train/components/baseinfoDetail.vue
@@ -125,10 +125,14 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="24" class="marg">
         <el-col :span="12">
           <el-form-item label="培训内容:" prop="trainContent">
             <el-input
               v-model="formInline.trainContent"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
@@ -140,6 +144,8 @@
           <el-form-item label="备注:">
             <el-input
               v-model="formInline.remark"
+              type="textarea"
+              autosize
               class="detail-input"
               disabled
             />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b7cffc7..1fb7e1a 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -63,7 +63,7 @@
   { text: '负责人', value: 'director', align: 'center' },
   { text: '培训内容', value: 'trainContent', align: 'center' },
   { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -228,7 +228,11 @@
 const goDetail = (row: IPlanList) => {
   $router.push({
     path: `trainPlanApprove/${props.status}/${row.id}`,
-    query: { ...row },
+    query: {
+      ...row,
+      decisionItem: `${row.decisionItem}`, // 同意、驳回、拒绝
+      taskId: row.taskId,
+    },
   })
 }
 // 获取到组织信息
@@ -250,7 +254,7 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL }).then((res) => {
+    getListSubmit({ id: row.id, formId: SCHEDULE.TRAIN_APPROVAL, processId: row.processId }).then((res) => {
       if (res.code === 200) {
         ElMessage({
           type: 'success',
@@ -269,7 +273,7 @@
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
-  let from = ''
+  const from = ''
   switch (buttonType) {
     case '查看':
       goDetail(row)
@@ -278,17 +282,12 @@
       approvalSubmit(row)
       break
     case '编辑':
-      if (row.approvalStatusName === '草稿箱') {
-        from = 'caogao'
-      }
-      else {
-        from = 'reject'
-      }
       $router.push({
         path: `/train/edit/${row.id}`,
         query: {
           from,
           processId: row.processId,
+          approvalStatusName: row.approvalStatusName,
         },
       })
       break
@@ -315,9 +314,10 @@
   () => props.status,
   (newVal: string) => {
     listQuery.value.approvalStatus = newVal
+    window.sessionStorage.setItem('trinPlanListMenu', newVal!)
     fetchData(false)
   },
-  { immediate: true })
+)
 // 打印列表
 function printList() {
   // 打印列
@@ -338,6 +338,18 @@
     ElMessage.warning('无可打印内容')
   }
 }
+
+onMounted(async () => {
+  // await getDict() // 获取字典
+  if (window.sessionStorage.getItem('trinPlanListMenu')) {
+    listQuery.value.approvalStatus = window.sessionStorage.getItem('trinPlanListMenu')!
+  }
+  else {
+    // listQuery.value.approvalStatus = approvalStatusReserveMap.value['全部']
+    listQuery.value.approvalStatus = '0' // 全部
+  }
+  fetchData(true)
+})
 </script>
 
 <template>
@@ -449,7 +461,7 @@
               >
                 拒绝
               </el-button>
-              <!-- <el-button
+              <el-button
                 v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -457,28 +469,8 @@
                 @click="clickBtn(row, '编辑')"
               >
                 编辑
-              </el-button> -->
-              <!-- 已取消的编辑隐藏 -->
-              <el-button
-                v-if="row.approvalStatusName === '未通过-驳回' || row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '编辑')"
-              >
-                编辑
               </el-button>
-              <!-- 已取消的提交按钮隐藏 -->
               <el-button
-                v-if="row.approvalStatusName === '草稿箱' "
-                size="small"
-                link
-                type="primary"
-                @click="clickBtn(row, '提交')"
-              >
-                提交
-              </el-button>
-              <!-- <el-button
                 v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消'"
                 size="small"
                 link
@@ -486,7 +478,7 @@
                 @click="clickBtn(row, '提交')"
               >
                 提交
-              </el-button> -->
+              </el-button>
               <!-- 是发起者且审批中可以取消 -->
               <el-button
                 v-if="row.approvalStatusName === '审批中'"
@@ -498,30 +490,8 @@
               >
                 取消
               </el-button>
-              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中'"
-                size="small"
-                link
-                type="danger"
-                :disabled="row.approvalStatusName === '未通过' || row.approvalStatusName === '已通过'"
-                @click="clickBtn(row, '删除')"
-              >
-                删除
-              </el-button> -->
-              <!-- 已取消的删除暂时去掉 -->
               <el-button
-                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '已取消'"
+                v-if="row.approvalStatusName !== '未通过' && row.approvalStatusName !== '已通过' && row.approvalStatusName !== '未通过-驳回' && row.approvalStatusName !== '审批中' && row.approvalStatusName !== '待审批'"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index f323b13..1914eb1 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -7,9 +7,13 @@
 import { getListDetail } from '@/api/measure/plan'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
+const processId = ref('') // 未通过-驳回编辑使用
+const decisionItem = ref('') // 同意、驳回、拒绝按钮权限
+const taskId = ref('') // 任务id，用于同意、驳回、拒绝审批
 const approvalDialog = ref() // 审批对话框组件ref
 const approvalRecord = ref() // 审批流程组件ref
 const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
@@ -69,7 +73,6 @@
     dataForm.value.trainStaffList = res.data.trainStaffList
   })
 }
-getInfo()
 
 // 底部表格
 const columns = [
@@ -86,35 +89,7 @@
   $router.back()
 }
 
-// 审批结束回调
-const approvalSuccess = () => {
-  close()
-}
-// 取消
-const handleCancel = () => {
-  const params = {
-    processInstanceId: dataForm.value.processInstanceId!,
-    comments: '',
-  }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      cancelApproval(params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
-      close()
-    })
-}
+// -----------------------------------------审批-------------------------------------------
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
@@ -127,24 +102,47 @@
     ElMessage.warning('流程实例id为空')
   }
 }
-
-// 点击数据后的操作按钮
-const clickBtn = (buttonType: string) => {
-  switch (buttonType) {
-    case '同意':
-      approvalDialog.value.initDialog('agree', dataForm.value.taskId)
-      break
-    case '驳回':
-      approvalDialog.value.initDialog('reject', dataForm.value.taskId)
-      break
-    case '拒绝':
-      approvalDialog.value.initDialog('refuse', dataForm.value.taskId)
-      break
-    case '取消':
-      handleCancel()
-      break
+// 审批结束回调
+const approvalSuccess = () => {
+  close() // 返回上一页
+}
+// 审批
+const handleApprove = (val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+          close()
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value)
   }
 }
+// ---------------------------------------------------------------------------------------
 
 // --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
 onMounted(() => {
@@ -164,10 +162,14 @@
   dataForm.value.processId = $route.query.processId as string// 流程实例id
   dataForm.value.processInstanceId = $route.query.processInstanceId as string// 流程实例id（取消操作使用）
   dataForm.value.trainTime = $route.query.trainTime as string// 培训时间
-  approvalStatusName.value = $route.query.approvalStatusName as string
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+  decisionItem.value = $route.query.decisionItem as string // 同意、驳回、拒绝按钮权限
+  taskId.value = $route.query.taskId as string // 流程实例id
   if (approvalStatusName.value !== '草稿箱') {
     getApprovalRecord(dataForm.value.processId) // 查询审批记录
   }
+  getInfo() // 获取表单详情
 })
 </script>
 
@@ -175,9 +177,21 @@
   <app-container>
     <detail-page title="培训计划审批-详情">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalStatusName === '待审批'" type="primary" @click="handleApprove('同意')">
+          同意
         </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '3'" type="primary" @click="handleApprove('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalStatusName === '待审批' && decisionItem !== '2'" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalStatusName === '审批中'" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
+          {{ item.name }}
+        </el-button> -->
         <el-button type="info" @click="close">
           关闭
         </el-button>
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
index 982c2ae..b037d2d 100644
--- a/src/views/measure/train/components/planListDialog.vue
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -127,7 +127,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择培训计划">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="65%" title="选择培训计划">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/components/selectMeasurePersonDialog.vue b/src/views/measure/train/components/selectMeasurePersonDialog.vue
index 46e460b..bcf4d03 100644
--- a/src/views/measure/train/components/selectMeasurePersonDialog.vue
+++ b/src/views/measure/train/components/selectMeasurePersonDialog.vue
@@ -1,12 +1,12 @@
 <!-- 计量人员列表弹窗 -->
 <script lang="ts" setup name="selectMeasurePersonDialog">
 import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
 import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { toTreeList } from '@/utils/structure'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
 // 查询条件
@@ -29,12 +29,12 @@
   { text: '姓名', value: 'name', align: 'center', fixed: true },
   { text: '学历', value: 'education', align: 'center' },
   { text: '性别', value: 'sex', align: 'center' },
-  { text: '工作部门', value: 'deptId', align: 'center' },
-  { text: '技术职务', value: 'technologyJob', align: 'center' },
+  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '技术职务', value: 'technologyJob', align: 'center', width: '120' },
   { text: '行政职务', value: 'administrationJob', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书号', value: 'verifierCertificateNo', align: 'center' },
-  { text: '证书有效日期', value: 'certificateDate', align: 'center' },
+  { text: '证书有效日期', value: 'certificateDate', align: 'center', width: '120' },
   { text: '技术考核', value: 'technologyExam', align: 'center' },
 ])
 // 获取部门
@@ -50,16 +50,22 @@
 // 获取数据列表
 const fetchData = () => {
   select.value = -1
+  loadingTable.value = true
   getStaffList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.records.map((item: any) => {
         return {
           ...item,
           sex: item.sex === '1' ? '男' : '女',
+          technologyExam: item.technologyExam == '0' ? '已考核' : '未考核',
+          certificateDate: item.certificateDate ? dayjs(item.certificateDate).format('YYYY-MM-DD') : item.certificateDate,
         }
       })
       total.value = parseInt(res.data.total)
+      loadingTable.value = false
     }
+  }).catch(() => {
+    loadingTable.value = false
   })
 }
 // 搜索
@@ -118,7 +124,7 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="50%">
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员" width="65%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index e8b4a37..a83a8a3 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -16,10 +16,10 @@
   getListUpdate,
 } from '@/api/measure/plan'
 const infoId = ref('') // id
-const from = ref('') // reject表示未通过驳回跳转过来的
 const userVisible = ref(false) // 控制选择用户弹框显隐
 const checkedList = ref([]) // 选择的成员
 const pageType = ref('add') // 页面类型: add,edit, detail
+const approvalStatusName = ref('') // 审批状态名称
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
@@ -51,10 +51,10 @@
 const ruleFormRef = ref<FormInstance>() // 表单ref
 // 人员信息表头
 const columns = [
-  { text: '学员名称', value: 'name' },
+  { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'createtime', width: '180' },
+  { text: '签到时间', value: 'signTime', width: '180' },
 ]
 const dialogVisible = ref(false)
 const SelectionList = ref<IaddPersonListType[]>([])
@@ -75,6 +75,7 @@
   trainContent: [{ required: true, message: '培训内容必填', trigger: ['blur', 'change'] }],
 })
 
+// ------------------------------------路由参数-------------------------------------------
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -82,13 +83,8 @@
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
-  if ($route.query.from) {
-    from.value = $route.query.from as string
-  }
-  if ($route.query.processId) {
-    processId.value = $route.query.processId as string
-  }
 }
+// -----------------------------------------------------------------------------------
 
 // 初始化router
 const $router = useRouter()
@@ -106,7 +102,7 @@
 const addRow = () => {
   const index = formInline.value.trainStaffList.findIndex(item => !item.name)
   if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
+    ElMessage.warning('请完善上一条人员信息')
     return
   }
   if (formInline.value) {
@@ -133,10 +129,6 @@
   listIndex.value = index // 选择的第几行
   userTrainRef.value.initDialog()
 }
-// 点击关闭
-const handleClose = () => {
-  dialogVisible.value = false
-}
 
 // 删除行
 const deleteList = () => {
@@ -162,10 +154,17 @@
 }
 // 选完计量人员
 const confirmSelectPerson = (val: any) => {
-  formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
-  formInline.value.trainStaffList[listIndex.value].company = val[0].deptId // 单位名称
-  formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
-  formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+  const index = formInline.value.trainStaffList.findIndex(item => item.staffId === val[0].id)
+  if (index === -1) {
+    formInline.value.trainStaffList[listIndex.value].name = val[0].name // 学员名称
+    formInline.value.trainStaffList[listIndex.value].company = val[0].deptName // 单位名称
+    formInline.value.trainStaffList[listIndex.value].technologyJob = val[0].technologyJob // 技术职称
+    formInline.value.trainStaffList[listIndex.value].staffId = val[0].id // 计量人员表id
+    formInline.value.trainStaffList[listIndex.value].planId = infoId.value // 培训计划表id
+  }
+  else {
+    ElMessage.warning('此人员已添加过')
+  }
 }
 // 点击提交
 const submit = async (formEl: FormInstance | undefined, buttonType: string) => {
@@ -207,7 +206,7 @@
   })
 }
 // 点击保存
-const preserve = async (formEl: FormInstance | undefined) => {
+const saveForm = async (formEl: FormInstance | undefined) => {
   const trainStaffList = formInline.value.trainStaffList.filter(item => item.name)
   if (!trainStaffList.length) {
     ElMessage.warning('培训人员不能为空')
@@ -222,12 +221,13 @@
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        if (pageType.value === 'edit') {
-          // 未通过-驳回编辑
-          if (from.value === 'reject') {
-            formInline.value.processId = processId.value
-            formInline.value.trainNumber = parseInt(formInline.value.trainNumber)
+        if (pageType.value === 'edit') { // 编辑
+          console.log('ppppppp---------', approvalStatusName.value)
 
+          // 未通过-驳回编辑
+          if (approvalStatusName.value === '未通过-驳回') { // 未通过-驳回
+            formInline.value.processId = processId.value
+            formInline.value.trainNumber = parseInt(formInline.value.trainNumber as string)
             getListFailUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -236,7 +236,7 @@
               }
             })
           }
-          else {
+          else { // 草稿箱、已取消
             getListDraftUpdate(formInline.value).then((res) => {
               if (res.code === 200) {
                 addId.value = res.data.id
@@ -245,24 +245,6 @@
               }
             })
           }
-          // else if (from.value === 'caogao') { // 草稿箱编辑
-          //   getListDraftUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
-          // else {
-          //   getListUpdate(formInline.value).then((res) => {
-          //     if (res.code === 200) {
-          //       addId.value = res.data.id
-          //       ElMessage.success('保存成功！')
-          //       close()
-          //     }
-          //   })
-          // }
         }
         else if (pageType.value === 'add') { // 新建
           getListSave(formInline.value).then((res) => {
@@ -285,6 +267,10 @@
   standard: '',
   extarCss: '',
 })
+onMounted(() => {
+  approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名称
+  processId.value = $route.query.processId as string
+})
 </script>
 
 <template>
@@ -298,18 +284,10 @@
         >
           提交
         </el-button> -->
-        <el-button
-          v-if="pageType === 'detail'"
-          v-print="printObj"
-          type="primary"
-        >
+        <el-button v-if="pageType === 'detail'" v-print="printObj" type="primary">
           打印
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="preserve(ruleFormRef)"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
@@ -453,6 +431,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model="formInline.remark"
+                type="textarea"
+                autosize
                 :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
                 :disabled="pageType === 'detail'"
               />
@@ -485,6 +465,9 @@
           :label="item.text"
           align="center"
         >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
           <template v-if="item.text === '学员名称' && pageType !== 'detail'" #default="scope">
             <el-input v-model="scope.row[item.value]" disabled :placeholder="`${item.text}`" class="input">
               <template #append>
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 2f21228..bb329e1 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -36,6 +36,7 @@
   taskId?: string // 任务id
   trainTime: string // 培训时间
   approvalStatusName: string // 审批状态名称
+  decisionItem?: string | number
 }
 // 下拉框类型
 export interface IOptions {
@@ -124,6 +125,7 @@
   technologyJob: string // 技术职称
   updateTime?: string // 更新时间
   createTime?: string // 创建时间
+  planId?: string // 培训计划表id
 }
 
 export interface IformInlineType {
@@ -139,7 +141,7 @@
   trainAddress: string // 培训地点
   trainContent: string // 培训内容
   trainHour: string // 培训学时
-  trainNumber: string // 培训人数
+  trainNumber: string | number // 培训人数
   trainPerson: string // 培训人员
   trainStaffList: IaddPersonListType[] // 人员信息
   trainTime: string // 培训时间
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 2c9e9d0..5d9aac5 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -56,7 +56,7 @@
   { text: '学员名称', value: 'name', required: true },
   { text: '单位名称', value: 'company', required: true },
   { text: '技术职称', value: 'technologyJob', required: true },
-  { text: '签到时间', value: 'signTime', width: '180', required: true },
+  { text: '签到时间', value: 'signTime', width: '180', required: false },
   { text: '考核结果', value: 'examResult', required: true },
 ])
 // 校验规则
@@ -476,7 +476,7 @@
             <!-- <el-input v-if="item.text === '考核结果' && pageType !== 'detail'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" /> -->
 
             <el-select
-              v-if="item.text === '考核结果' && pageType === 'edit'"
+              v-if="item.text === '考核结果' && (pageType === 'edit' || pageType === 'add')"
               v-model="scope.row.examResult"
               placeholder="请选择考核结果"
             >
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 9c3691c..ae65c1a 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -6,6 +6,7 @@
 import { getDictByCode } from '@/api/system/dict'
 
 const dictStore = useDictStore()
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
 const buttonsSet: { [key: string]: IButtonApprove[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '编辑', type: 'primary' },
@@ -23,7 +24,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    // { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
@@ -68,6 +69,10 @@
 async function getDict() {
   // // 审批状态
   const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
   // 制作右上角的菜单
   res.data.forEach((item: dictType) => {
     if (item.name === '全部' || item.name === '草稿箱'
@@ -89,14 +94,20 @@
 // 挂载的时候找到之前存过的审批类型
 onMounted(async () => {
   await getDict()
-  currentTab.value = sessionStorage.getItem('trinPlanListMenu') || '全部'
-  sessionStorage.getItem('trinPlanListMenu') ? sessionStorage.removeItem('trinPlanListMenu') : ''
+  currentTab.value = window.sessionStorage.getItem('trinPlanListMenu') || '全部'
+  currentApprovalStatus.value = approvalStatusReserveMap.value[currentTab.value]
+  // currentTab.value = sessionStorage.getItem('trinPlanListMenu') || '全部'
+  // sessionStorage.getItem('trinPlanListMenu') ? sessionStorage.removeItem('trinPlanListMenu') : ''
 })
 
 watch(currentTab, (newValue) => {
-  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentApprovalStatus.value = approvalStatusReserveMap.value[newValue]
+  window.sessionStorage.setItem('trinPlanListMenu', currentApprovalStatus.value)
   currentButtons.value = buttonsSet[newValue]
-}, { deep: true, immediate: true })
+
+  // currentApprovalStatus.value = approvalStatusList[newValue]
+  // currentButtons.value = buttonsSet[newValue]
+}, { deep: true })
 </script>
 
 <template>