diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..076ef51 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,6 +1,8 @@
+<!-- 培训计划审批表格 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,7 +11,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -32,85 +34,38 @@
 const listQuery: Ref<IlistApprovalQuery> = ref({
   approvalStatus: props.status, // 审批状态
   formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  createTime: '', // 创建时间
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
   deptId: '', // 部门id
   director: '', // 负责人
   effectiveCompany: '', // 实施单位
-  trainTime: '', // 培训时间
+  trainEndTime: '', // 培训结束时间
+  trainStartTime: '', // 培训开始时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 筛选时间段数据-创建时间
+const createTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 筛选时间段数据-培训时间
+const trainTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    width: '90',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', align: 'center', width: '160' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -126,6 +81,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -165,7 +124,7 @@
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -178,7 +137,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then(() => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -199,14 +158,18 @@
   listQuery.value = {
     approvalStatus: props.status, // 审批状态
     formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    createTime: '', // 创建时间
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
     deptId: '', // 部门id
     director: '', // 负责人
     effectiveCompany: '', // 实施单位
-    trainTime: '', // 培训时间
+    trainEndTime: '', // 培训结束时间
+    trainStartTime: '', // 培训开始时间
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
+  createTimeRange.value = ['', '']
+  trainTimeRange.value = ['', '']
   fetchData(true)
 }
 // 主管部门下拉框
@@ -214,14 +177,28 @@
 
 // 导出
 const exportExcelBtn = () => {
-  // TODO: 审批列表导出
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    exportPlanList(listQuery.value).then((res) => {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+      createEndTime: listQuery.value.createEndTime, // 创建结束时间
+      createStartTime: listQuery.value.createStartTime, // 创建开始时间
+      deptId: listQuery.value.deptId, // 部门id
+      director: listQuery.value.director, // 负责人
+      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
+      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
+      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportPlanList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -244,7 +221,10 @@
 }
 // 跳转到详情
 const goDetail = (row: IPlanList) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push({
+    path: `trainPlanApprove/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -284,10 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
@@ -357,22 +333,26 @@
     >
       <search-item>
         <el-date-picker
-          v-model="listQuery.trainTime"
-          type="datetime"
-          placeholder="培训时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="trainTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="培训开始时间"
+          end-placeholder="培训结束时间"
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.createTime"
-          type="datetime"
-          placeholder="创建时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="createTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
         />
       </search-item>
       <search-item>
@@ -400,15 +380,23 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- 审批的导出功能去掉 -->
+        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -423,7 +411,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +421,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +431,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..076ef51 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,6 +1,8 @@
+<!-- 培训计划审批表格 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,7 +11,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -32,85 +34,38 @@
 const listQuery: Ref<IlistApprovalQuery> = ref({
   approvalStatus: props.status, // 审批状态
   formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  createTime: '', // 创建时间
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
   deptId: '', // 部门id
   director: '', // 负责人
   effectiveCompany: '', // 实施单位
-  trainTime: '', // 培训时间
+  trainEndTime: '', // 培训结束时间
+  trainStartTime: '', // 培训开始时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 筛选时间段数据-创建时间
+const createTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 筛选时间段数据-培训时间
+const trainTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    width: '90',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', align: 'center', width: '160' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -126,6 +81,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -165,7 +124,7 @@
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -178,7 +137,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then(() => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -199,14 +158,18 @@
   listQuery.value = {
     approvalStatus: props.status, // 审批状态
     formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    createTime: '', // 创建时间
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
     deptId: '', // 部门id
     director: '', // 负责人
     effectiveCompany: '', // 实施单位
-    trainTime: '', // 培训时间
+    trainEndTime: '', // 培训结束时间
+    trainStartTime: '', // 培训开始时间
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
+  createTimeRange.value = ['', '']
+  trainTimeRange.value = ['', '']
   fetchData(true)
 }
 // 主管部门下拉框
@@ -214,14 +177,28 @@
 
 // 导出
 const exportExcelBtn = () => {
-  // TODO: 审批列表导出
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    exportPlanList(listQuery.value).then((res) => {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+      createEndTime: listQuery.value.createEndTime, // 创建结束时间
+      createStartTime: listQuery.value.createStartTime, // 创建开始时间
+      deptId: listQuery.value.deptId, // 部门id
+      director: listQuery.value.director, // 负责人
+      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
+      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
+      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportPlanList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -244,7 +221,10 @@
 }
 // 跳转到详情
 const goDetail = (row: IPlanList) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push({
+    path: `trainPlanApprove/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -284,10 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
@@ -357,22 +333,26 @@
     >
       <search-item>
         <el-date-picker
-          v-model="listQuery.trainTime"
-          type="datetime"
-          placeholder="培训时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="trainTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="培训开始时间"
+          end-placeholder="培训结束时间"
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.createTime"
-          type="datetime"
-          placeholder="创建时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="createTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
         />
       </search-item>
       <search-item>
@@ -400,15 +380,23 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- 审批的导出功能去掉 -->
+        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -423,7 +411,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +421,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +431,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 3a145fa..dec5cc0 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -1,15 +1,17 @@
-<script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
+<!-- 培训计划审批详情 -->
+<script lang="ts" setup name="PlanApprovalDetail">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
-
+const approvalDialog = ref() // 审批对话框组件ref
+const approvalRecord = ref() // 审批流程组件ref
 const buttonsSet: { [key: string]: IButton[] } = {
   2: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -30,20 +32,21 @@
 }
 // 详情表单
 const dataForm = ref({
-  deptId: '',
-  deptName: '',
-  director: '',
-  effectiveCompany: '',
-  planName: '',
-  planNo: '',
-  remark: '',
-  trainAddress: '',
-  trainContent: '',
-  trainHour: '',
-  trainNumber: 0,
-  trainPerson: '',
-  taskId: '',
-  processId: '',
+  deptId: '', // 组织部门id-系统组织表
+  deptName: '', // 主管部门
+  director: '', // 负责人-人员名字
+  effectiveCompany: '', // 实施单位
+  planName: '', // 培训名称
+  planNo: '', // 计划编号
+  remark: '', // 备注
+  trainAddress: '', //	培训地点
+  trainContent: '', //	培训地点
+  trainHour: '', //	培训地点
+  trainNumber: 0, // 培训人数
+  trainPerson: '', // 培训对象
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  processId: '', // 流程实例id
+  processInstanceId: '', // 流程实例id（取消操作使用）
   trainStaffList: [
     {
       company: '',
@@ -56,12 +59,13 @@
       technologyJob: '',
     },
   ],
-  trainTime: '',
+  trainTime: '', // 培训时间
 })
+// --------------------------表单详情通过前一页表格数据（路由）获取--------------------------
 // 获取表单详情
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
+    dataForm.value.trainStaffList = res.data.trainStaffList
     // if (dataForm.value.approvalStatus) {
     //   // 待审批
     //   if (dataForm.value.approvalStatus == '2') {
@@ -93,12 +97,12 @@
 
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
+    processInstanceId: dataForm.value.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -111,15 +115,27 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
         })
       })
+      close()
     })
 }
-const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    // 数据处理
+
+    approvalRecordData.value = res.data
+    console.log('-----------------------审批流程')
+    console.log(approvalRecordData.value)
+  })
+}
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -137,8 +153,26 @@
       break
   }
 }
-onMounted(async () => {
-  dataForm.value.processId = $route.query.processId as string // 任务id
+
+// --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
+onMounted(() => {
+  dataForm.value.deptId = $route.query.deptId as string// 组织部门id-系统组织表
+  dataForm.value.deptName = $route.query.deptName as string// 主管部门
+  dataForm.value.director = $route.query.director as string// 负责人-人员名字
+  dataForm.value.effectiveCompany = $route.query.effectiveCompany as string// 实施单位
+  dataForm.value.planName = $route.query.planName as string// 培训名称
+  dataForm.value.planNo = $route.query.planNo as string// 计划编号
+  dataForm.value.remark = $route.query.remark as string // 备注
+  dataForm.value.trainAddress = $route.query.trainAddress as string//	培训地点
+  dataForm.value.trainContent = $route.query.trainContent as string//	培训地点
+  dataForm.value.trainHour = $route.query.trainHour as string//	培训地点
+  dataForm.value.trainNumber = parseInt($route.query.trainNumber as string)// 培训人数
+  dataForm.value.trainPerson = $route.query.trainPerson as string// 培训对象
+  dataForm.value.taskId = $route.query.taskId as string// 任务id（同意、驳回等操作使用）
+  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// 培训时间
+  getApprovalRecord(dataForm.value.processId)
 })
 </script>
 
@@ -155,10 +189,7 @@
       </template>
       <base-info-detail :form-inline="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="dataForm.processId" />
-    </detail-block>
+
     <detail-block title="人员信息">
       <el-table
         :data="dataForm.trainStaffList"
@@ -179,6 +210,11 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 审批弹出框组件 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..076ef51 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,6 +1,8 @@
+<!-- 培训计划审批表格 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,7 +11,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -32,85 +34,38 @@
 const listQuery: Ref<IlistApprovalQuery> = ref({
   approvalStatus: props.status, // 审批状态
   formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  createTime: '', // 创建时间
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
   deptId: '', // 部门id
   director: '', // 负责人
   effectiveCompany: '', // 实施单位
-  trainTime: '', // 培训时间
+  trainEndTime: '', // 培训结束时间
+  trainStartTime: '', // 培训开始时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 筛选时间段数据-创建时间
+const createTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 筛选时间段数据-培训时间
+const trainTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    width: '90',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', align: 'center', width: '160' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -126,6 +81,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -165,7 +124,7 @@
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -178,7 +137,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then(() => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -199,14 +158,18 @@
   listQuery.value = {
     approvalStatus: props.status, // 审批状态
     formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    createTime: '', // 创建时间
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
     deptId: '', // 部门id
     director: '', // 负责人
     effectiveCompany: '', // 实施单位
-    trainTime: '', // 培训时间
+    trainEndTime: '', // 培训结束时间
+    trainStartTime: '', // 培训开始时间
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
+  createTimeRange.value = ['', '']
+  trainTimeRange.value = ['', '']
   fetchData(true)
 }
 // 主管部门下拉框
@@ -214,14 +177,28 @@
 
 // 导出
 const exportExcelBtn = () => {
-  // TODO: 审批列表导出
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    exportPlanList(listQuery.value).then((res) => {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+      createEndTime: listQuery.value.createEndTime, // 创建结束时间
+      createStartTime: listQuery.value.createStartTime, // 创建开始时间
+      deptId: listQuery.value.deptId, // 部门id
+      director: listQuery.value.director, // 负责人
+      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
+      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
+      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportPlanList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -244,7 +221,10 @@
 }
 // 跳转到详情
 const goDetail = (row: IPlanList) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push({
+    path: `trainPlanApprove/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -284,10 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
@@ -357,22 +333,26 @@
     >
       <search-item>
         <el-date-picker
-          v-model="listQuery.trainTime"
-          type="datetime"
-          placeholder="培训时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="trainTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="培训开始时间"
+          end-placeholder="培训结束时间"
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.createTime"
-          type="datetime"
-          placeholder="创建时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="createTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
         />
       </search-item>
       <search-item>
@@ -400,15 +380,23 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- 审批的导出功能去掉 -->
+        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -423,7 +411,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +421,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +431,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 3a145fa..dec5cc0 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -1,15 +1,17 @@
-<script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
+<!-- 培训计划审批详情 -->
+<script lang="ts" setup name="PlanApprovalDetail">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
-
+const approvalDialog = ref() // 审批对话框组件ref
+const approvalRecord = ref() // 审批流程组件ref
 const buttonsSet: { [key: string]: IButton[] } = {
   2: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -30,20 +32,21 @@
 }
 // 详情表单
 const dataForm = ref({
-  deptId: '',
-  deptName: '',
-  director: '',
-  effectiveCompany: '',
-  planName: '',
-  planNo: '',
-  remark: '',
-  trainAddress: '',
-  trainContent: '',
-  trainHour: '',
-  trainNumber: 0,
-  trainPerson: '',
-  taskId: '',
-  processId: '',
+  deptId: '', // 组织部门id-系统组织表
+  deptName: '', // 主管部门
+  director: '', // 负责人-人员名字
+  effectiveCompany: '', // 实施单位
+  planName: '', // 培训名称
+  planNo: '', // 计划编号
+  remark: '', // 备注
+  trainAddress: '', //	培训地点
+  trainContent: '', //	培训地点
+  trainHour: '', //	培训地点
+  trainNumber: 0, // 培训人数
+  trainPerson: '', // 培训对象
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  processId: '', // 流程实例id
+  processInstanceId: '', // 流程实例id（取消操作使用）
   trainStaffList: [
     {
       company: '',
@@ -56,12 +59,13 @@
       technologyJob: '',
     },
   ],
-  trainTime: '',
+  trainTime: '', // 培训时间
 })
+// --------------------------表单详情通过前一页表格数据（路由）获取--------------------------
 // 获取表单详情
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
+    dataForm.value.trainStaffList = res.data.trainStaffList
     // if (dataForm.value.approvalStatus) {
     //   // 待审批
     //   if (dataForm.value.approvalStatus == '2') {
@@ -93,12 +97,12 @@
 
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
+    processInstanceId: dataForm.value.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -111,15 +115,27 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
         })
       })
+      close()
     })
 }
-const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    // 数据处理
+
+    approvalRecordData.value = res.data
+    console.log('-----------------------审批流程')
+    console.log(approvalRecordData.value)
+  })
+}
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -137,8 +153,26 @@
       break
   }
 }
-onMounted(async () => {
-  dataForm.value.processId = $route.query.processId as string // 任务id
+
+// --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
+onMounted(() => {
+  dataForm.value.deptId = $route.query.deptId as string// 组织部门id-系统组织表
+  dataForm.value.deptName = $route.query.deptName as string// 主管部门
+  dataForm.value.director = $route.query.director as string// 负责人-人员名字
+  dataForm.value.effectiveCompany = $route.query.effectiveCompany as string// 实施单位
+  dataForm.value.planName = $route.query.planName as string// 培训名称
+  dataForm.value.planNo = $route.query.planNo as string// 计划编号
+  dataForm.value.remark = $route.query.remark as string // 备注
+  dataForm.value.trainAddress = $route.query.trainAddress as string//	培训地点
+  dataForm.value.trainContent = $route.query.trainContent as string//	培训地点
+  dataForm.value.trainHour = $route.query.trainHour as string//	培训地点
+  dataForm.value.trainNumber = parseInt($route.query.trainNumber as string)// 培训人数
+  dataForm.value.trainPerson = $route.query.trainPerson as string// 培训对象
+  dataForm.value.taskId = $route.query.taskId as string// 任务id（同意、驳回等操作使用）
+  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// 培训时间
+  getApprovalRecord(dataForm.value.processId)
 })
 </script>
 
@@ -155,10 +189,7 @@
       </template>
       <base-info-detail :form-inline="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="dataForm.processId" />
-    </detail-block>
+
     <detail-block title="人员信息">
       <el-table
         :data="dataForm.trainStaffList"
@@ -179,6 +210,11 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 审批弹出框组件 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2862696..631ebc6 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -216,9 +216,9 @@
 }
 // 打印
 const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '证书报告模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  id: 'main', // 需要打印元素的id
+  popTitle: '培训计划详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>培训计划详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -226,7 +226,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container id="main">
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
@@ -244,6 +244,7 @@
           打印
         </el-button>
         <el-button
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >
@@ -413,7 +414,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..076ef51 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,6 +1,8 @@
+<!-- 培训计划审批表格 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,7 +11,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -32,85 +34,38 @@
 const listQuery: Ref<IlistApprovalQuery> = ref({
   approvalStatus: props.status, // 审批状态
   formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  createTime: '', // 创建时间
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
   deptId: '', // 部门id
   director: '', // 负责人
   effectiveCompany: '', // 实施单位
-  trainTime: '', // 培训时间
+  trainEndTime: '', // 培训结束时间
+  trainStartTime: '', // 培训开始时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 筛选时间段数据-创建时间
+const createTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 筛选时间段数据-培训时间
+const trainTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    width: '90',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', align: 'center', width: '160' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -126,6 +81,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -165,7 +124,7 @@
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -178,7 +137,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then(() => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -199,14 +158,18 @@
   listQuery.value = {
     approvalStatus: props.status, // 审批状态
     formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    createTime: '', // 创建时间
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
     deptId: '', // 部门id
     director: '', // 负责人
     effectiveCompany: '', // 实施单位
-    trainTime: '', // 培训时间
+    trainEndTime: '', // 培训结束时间
+    trainStartTime: '', // 培训开始时间
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
+  createTimeRange.value = ['', '']
+  trainTimeRange.value = ['', '']
   fetchData(true)
 }
 // 主管部门下拉框
@@ -214,14 +177,28 @@
 
 // 导出
 const exportExcelBtn = () => {
-  // TODO: 审批列表导出
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    exportPlanList(listQuery.value).then((res) => {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+      createEndTime: listQuery.value.createEndTime, // 创建结束时间
+      createStartTime: listQuery.value.createStartTime, // 创建开始时间
+      deptId: listQuery.value.deptId, // 部门id
+      director: listQuery.value.director, // 负责人
+      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
+      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
+      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportPlanList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -244,7 +221,10 @@
 }
 // 跳转到详情
 const goDetail = (row: IPlanList) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push({
+    path: `trainPlanApprove/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -284,10 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
@@ -357,22 +333,26 @@
     >
       <search-item>
         <el-date-picker
-          v-model="listQuery.trainTime"
-          type="datetime"
-          placeholder="培训时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="trainTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="培训开始时间"
+          end-placeholder="培训结束时间"
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.createTime"
-          type="datetime"
-          placeholder="创建时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="createTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
         />
       </search-item>
       <search-item>
@@ -400,15 +380,23 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- 审批的导出功能去掉 -->
+        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -423,7 +411,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +421,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +431,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 3a145fa..dec5cc0 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -1,15 +1,17 @@
-<script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
+<!-- 培训计划审批详情 -->
+<script lang="ts" setup name="PlanApprovalDetail">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
-
+const approvalDialog = ref() // 审批对话框组件ref
+const approvalRecord = ref() // 审批流程组件ref
 const buttonsSet: { [key: string]: IButton[] } = {
   2: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -30,20 +32,21 @@
 }
 // 详情表单
 const dataForm = ref({
-  deptId: '',
-  deptName: '',
-  director: '',
-  effectiveCompany: '',
-  planName: '',
-  planNo: '',
-  remark: '',
-  trainAddress: '',
-  trainContent: '',
-  trainHour: '',
-  trainNumber: 0,
-  trainPerson: '',
-  taskId: '',
-  processId: '',
+  deptId: '', // 组织部门id-系统组织表
+  deptName: '', // 主管部门
+  director: '', // 负责人-人员名字
+  effectiveCompany: '', // 实施单位
+  planName: '', // 培训名称
+  planNo: '', // 计划编号
+  remark: '', // 备注
+  trainAddress: '', //	培训地点
+  trainContent: '', //	培训地点
+  trainHour: '', //	培训地点
+  trainNumber: 0, // 培训人数
+  trainPerson: '', // 培训对象
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  processId: '', // 流程实例id
+  processInstanceId: '', // 流程实例id（取消操作使用）
   trainStaffList: [
     {
       company: '',
@@ -56,12 +59,13 @@
       technologyJob: '',
     },
   ],
-  trainTime: '',
+  trainTime: '', // 培训时间
 })
+// --------------------------表单详情通过前一页表格数据（路由）获取--------------------------
 // 获取表单详情
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
+    dataForm.value.trainStaffList = res.data.trainStaffList
     // if (dataForm.value.approvalStatus) {
     //   // 待审批
     //   if (dataForm.value.approvalStatus == '2') {
@@ -93,12 +97,12 @@
 
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
+    processInstanceId: dataForm.value.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -111,15 +115,27 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
         })
       })
+      close()
     })
 }
-const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    // 数据处理
+
+    approvalRecordData.value = res.data
+    console.log('-----------------------审批流程')
+    console.log(approvalRecordData.value)
+  })
+}
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -137,8 +153,26 @@
       break
   }
 }
-onMounted(async () => {
-  dataForm.value.processId = $route.query.processId as string // 任务id
+
+// --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
+onMounted(() => {
+  dataForm.value.deptId = $route.query.deptId as string// 组织部门id-系统组织表
+  dataForm.value.deptName = $route.query.deptName as string// 主管部门
+  dataForm.value.director = $route.query.director as string// 负责人-人员名字
+  dataForm.value.effectiveCompany = $route.query.effectiveCompany as string// 实施单位
+  dataForm.value.planName = $route.query.planName as string// 培训名称
+  dataForm.value.planNo = $route.query.planNo as string// 计划编号
+  dataForm.value.remark = $route.query.remark as string // 备注
+  dataForm.value.trainAddress = $route.query.trainAddress as string//	培训地点
+  dataForm.value.trainContent = $route.query.trainContent as string//	培训地点
+  dataForm.value.trainHour = $route.query.trainHour as string//	培训地点
+  dataForm.value.trainNumber = parseInt($route.query.trainNumber as string)// 培训人数
+  dataForm.value.trainPerson = $route.query.trainPerson as string// 培训对象
+  dataForm.value.taskId = $route.query.taskId as string// 任务id（同意、驳回等操作使用）
+  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// 培训时间
+  getApprovalRecord(dataForm.value.processId)
 })
 </script>
 
@@ -155,10 +189,7 @@
       </template>
       <base-info-detail :form-inline="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="dataForm.processId" />
-    </detail-block>
+
     <detail-block title="人员信息">
       <el-table
         :data="dataForm.trainStaffList"
@@ -179,6 +210,11 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 审批弹出框组件 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2862696..631ebc6 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -216,9 +216,9 @@
 }
 // 打印
 const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '证书报告模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  id: 'main', // 需要打印元素的id
+  popTitle: '培训计划详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>培训计划详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -226,7 +226,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container id="main">
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
@@ -244,6 +244,7 @@
           打印
         </el-button>
         <el-button
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >
@@ -413,7 +414,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 8963167..ebcb081 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -31,6 +31,7 @@
   trainNumber: string // 培训人数
   trainPerson: string // 培训对象
   processId: string // 审批id
+  processInstanceId: string // 取消审批专用
   trainStaffList: IObject[] // 学员列表
   taskId?: string // 任务id
   trainTime: string // 培训时间
@@ -45,11 +46,13 @@
 export interface IlistApprovalQuery {
   approvalStatus: string // 审批状态
   formId: string // 表单id
-  createTime: string // 创建时间
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
   deptId: string // 部门id
   director: string // 负责人
   effectiveCompany: string // 实施单位
-  trainTime: string // 培训时间
+  trainEndTime: string // 培训结束时间
+  trainStartTime: string // 培训开始时间
   offset: number // 当前页
   limit: number // 每页多少条
 }
@@ -140,3 +143,24 @@
   trainStaffList: IaddPersonListType[] // 人员信息
   trainTime: string // 培训时间
 }
+
+// 培训计划审批
+export interface menuType {
+  name: string
+  value: string
+}
+// 培训计划审批
+export interface IButtonApprove {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..076ef51 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,6 +1,8 @@
+<!-- 培训计划审批表格 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,7 +11,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -32,85 +34,38 @@
 const listQuery: Ref<IlistApprovalQuery> = ref({
   approvalStatus: props.status, // 审批状态
   formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  createTime: '', // 创建时间
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
   deptId: '', // 部门id
   director: '', // 负责人
   effectiveCompany: '', // 实施单位
-  trainTime: '', // 培训时间
+  trainEndTime: '', // 培训结束时间
+  trainStartTime: '', // 培训开始时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 筛选时间段数据-创建时间
+const createTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 筛选时间段数据-培训时间
+const trainTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    width: '90',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', align: 'center', width: '160' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -126,6 +81,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -165,7 +124,7 @@
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -178,7 +137,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then(() => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -199,14 +158,18 @@
   listQuery.value = {
     approvalStatus: props.status, // 审批状态
     formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    createTime: '', // 创建时间
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
     deptId: '', // 部门id
     director: '', // 负责人
     effectiveCompany: '', // 实施单位
-    trainTime: '', // 培训时间
+    trainEndTime: '', // 培训结束时间
+    trainStartTime: '', // 培训开始时间
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
+  createTimeRange.value = ['', '']
+  trainTimeRange.value = ['', '']
   fetchData(true)
 }
 // 主管部门下拉框
@@ -214,14 +177,28 @@
 
 // 导出
 const exportExcelBtn = () => {
-  // TODO: 审批列表导出
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    exportPlanList(listQuery.value).then((res) => {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+      createEndTime: listQuery.value.createEndTime, // 创建结束时间
+      createStartTime: listQuery.value.createStartTime, // 创建开始时间
+      deptId: listQuery.value.deptId, // 部门id
+      director: listQuery.value.director, // 负责人
+      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
+      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
+      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportPlanList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -244,7 +221,10 @@
 }
 // 跳转到详情
 const goDetail = (row: IPlanList) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push({
+    path: `trainPlanApprove/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -284,10 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
@@ -357,22 +333,26 @@
     >
       <search-item>
         <el-date-picker
-          v-model="listQuery.trainTime"
-          type="datetime"
-          placeholder="培训时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="trainTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="培训开始时间"
+          end-placeholder="培训结束时间"
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.createTime"
-          type="datetime"
-          placeholder="创建时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="createTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
         />
       </search-item>
       <search-item>
@@ -400,15 +380,23 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- 审批的导出功能去掉 -->
+        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -423,7 +411,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +421,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +431,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 3a145fa..dec5cc0 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -1,15 +1,17 @@
-<script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
+<!-- 培训计划审批详情 -->
+<script lang="ts" setup name="PlanApprovalDetail">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
-
+const approvalDialog = ref() // 审批对话框组件ref
+const approvalRecord = ref() // 审批流程组件ref
 const buttonsSet: { [key: string]: IButton[] } = {
   2: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -30,20 +32,21 @@
 }
 // 详情表单
 const dataForm = ref({
-  deptId: '',
-  deptName: '',
-  director: '',
-  effectiveCompany: '',
-  planName: '',
-  planNo: '',
-  remark: '',
-  trainAddress: '',
-  trainContent: '',
-  trainHour: '',
-  trainNumber: 0,
-  trainPerson: '',
-  taskId: '',
-  processId: '',
+  deptId: '', // 组织部门id-系统组织表
+  deptName: '', // 主管部门
+  director: '', // 负责人-人员名字
+  effectiveCompany: '', // 实施单位
+  planName: '', // 培训名称
+  planNo: '', // 计划编号
+  remark: '', // 备注
+  trainAddress: '', //	培训地点
+  trainContent: '', //	培训地点
+  trainHour: '', //	培训地点
+  trainNumber: 0, // 培训人数
+  trainPerson: '', // 培训对象
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  processId: '', // 流程实例id
+  processInstanceId: '', // 流程实例id（取消操作使用）
   trainStaffList: [
     {
       company: '',
@@ -56,12 +59,13 @@
       technologyJob: '',
     },
   ],
-  trainTime: '',
+  trainTime: '', // 培训时间
 })
+// --------------------------表单详情通过前一页表格数据（路由）获取--------------------------
 // 获取表单详情
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
+    dataForm.value.trainStaffList = res.data.trainStaffList
     // if (dataForm.value.approvalStatus) {
     //   // 待审批
     //   if (dataForm.value.approvalStatus == '2') {
@@ -93,12 +97,12 @@
 
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
+    processInstanceId: dataForm.value.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -111,15 +115,27 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
         })
       })
+      close()
     })
 }
-const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    // 数据处理
+
+    approvalRecordData.value = res.data
+    console.log('-----------------------审批流程')
+    console.log(approvalRecordData.value)
+  })
+}
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -137,8 +153,26 @@
       break
   }
 }
-onMounted(async () => {
-  dataForm.value.processId = $route.query.processId as string // 任务id
+
+// --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
+onMounted(() => {
+  dataForm.value.deptId = $route.query.deptId as string// 组织部门id-系统组织表
+  dataForm.value.deptName = $route.query.deptName as string// 主管部门
+  dataForm.value.director = $route.query.director as string// 负责人-人员名字
+  dataForm.value.effectiveCompany = $route.query.effectiveCompany as string// 实施单位
+  dataForm.value.planName = $route.query.planName as string// 培训名称
+  dataForm.value.planNo = $route.query.planNo as string// 计划编号
+  dataForm.value.remark = $route.query.remark as string // 备注
+  dataForm.value.trainAddress = $route.query.trainAddress as string//	培训地点
+  dataForm.value.trainContent = $route.query.trainContent as string//	培训地点
+  dataForm.value.trainHour = $route.query.trainHour as string//	培训地点
+  dataForm.value.trainNumber = parseInt($route.query.trainNumber as string)// 培训人数
+  dataForm.value.trainPerson = $route.query.trainPerson as string// 培训对象
+  dataForm.value.taskId = $route.query.taskId as string// 任务id（同意、驳回等操作使用）
+  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// 培训时间
+  getApprovalRecord(dataForm.value.processId)
 })
 </script>
 
@@ -155,10 +189,7 @@
       </template>
       <base-info-detail :form-inline="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="dataForm.processId" />
-    </detail-block>
+
     <detail-block title="人员信息">
       <el-table
         :data="dataForm.trainStaffList"
@@ -179,6 +210,11 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 审批弹出框组件 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2862696..631ebc6 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -216,9 +216,9 @@
 }
 // 打印
 const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '证书报告模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  id: 'main', // 需要打印元素的id
+  popTitle: '培训计划详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>培训计划详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -226,7 +226,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container id="main">
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
@@ -244,6 +244,7 @@
           打印
         </el-button>
         <el-button
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >
@@ -413,7 +414,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 8963167..ebcb081 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -31,6 +31,7 @@
   trainNumber: string // 培训人数
   trainPerson: string // 培训对象
   processId: string // 审批id
+  processInstanceId: string // 取消审批专用
   trainStaffList: IObject[] // 学员列表
   taskId?: string // 任务id
   trainTime: string // 培训时间
@@ -45,11 +46,13 @@
 export interface IlistApprovalQuery {
   approvalStatus: string // 审批状态
   formId: string // 表单id
-  createTime: string // 创建时间
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
   deptId: string // 部门id
   director: string // 负责人
   effectiveCompany: string // 实施单位
-  trainTime: string // 培训时间
+  trainEndTime: string // 培训结束时间
+  trainStartTime: string // 培训开始时间
   offset: number // 当前页
   limit: number // 每页多少条
 }
@@ -140,3 +143,24 @@
   trainStaffList: IaddPersonListType[] // 人员信息
   trainTime: string // 培训时间
 }
+
+// 培训计划审批
+export interface menuType {
+  name: string
+  value: string
+}
+// 培训计划审批
+export interface IButtonApprove {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index d623767..310ecb8 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -239,7 +239,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
         />
@@ -250,7 +250,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
         />

diff --git a/public/departments.json b/public/departments.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
deleted file mode 100644
index dfd7789..0000000
--- a/public/departments0.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [{
-            "departmentKey": "RLXZB_V2",
-            "departmentName": "人力行政部",
-            "id": "150",
-            "parentId": "0",
-            "departmentNames": "人力行政部"
-        }, {
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "id": "324",
-            "parentId": "0",
-            "departmentNames": "法务部"
-        }],
-        "employees": [{
-            "id": "53128111",
-            "employeeName": "雅楠",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": []
-    }
-}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
deleted file mode 100644
index 34b8cc2..0000000
--- a/public/departments324.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "childDepartments": [],
-        "employees": [{
-            "id": "53128133",
-            "employeeName": "测试3",
-            "isLeave": "0",
-            "open": "false"
-        }],
-        "titleDepartments": [{
-            "departmentId": "324",
-            "departmentKey": "ZNBN",
-            "departmentName": "法务部",
-            "departmentNames": "法务部",
-            "id": "324",
-            "parentId": "0"
-        }]
-    }
-}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
deleted file mode 100644
index 227a989..0000000
--- a/public/employees.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "code": "200",
-    "msg": "操作成功",
-    "data": {
-        "navigatepageNums": ["1"],
-        "startRow": "1",
-        "hasNextPage": "false",
-        "prePage": "0",
-        "nextPage": "0",
-        "endRow": "3",
-        "pageSize": "30",
-        "list": [{
-            "departmentName": "招商事业部",
-            "employeeName": "111111",
-            "employeeDepartmentId": "121",
-            "id": "5312",
-            "departmentNames": "招商事业部"
-        }, {
-            "departmentName": "111",
-            "employeeName": "东亚-测试",
-            "employeeDepartmentId": "139",
-            "id": "2515638",
-            "departmentNames": "111"
-        }, {
-            "departmentName": "招商事业部",
-            "employeeName": "1111",
-            "employeeDepartmentId": "121",
-            "id": "2515746",
-            "departmentNames": "招商事业部"
-        }],
-        "pageNum": "1",
-        "navigatePages": "8",
-        "navigateFirstPage": "1",
-        "total": "3",
-        "pages": "1",
-        "size": "3",
-        "isLastPage": "true",
-        "hasPreviousPage": "false",
-        "navigateLastPage": "1",
-        "isFirstPage": "true"
-    }
-}
\ No newline at end of file
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
index 5054378..b21f20d 100644
--- a/src/api/business/schedule/interchangeList.ts
+++ b/src/api/business/schedule/interchangeList.ts
@@ -23,10 +23,10 @@
   })
 }
 
-// 根据样品id收入
+// 更改状态-回退、收入、归还、无需检测 按钮
 export function interchangeStatusChange(data: { orderId: string | number; reason: string; sampleId: string | number; status: string }) {
   return request({
-    url: '/device/dispatch/satus/change',
+    url: '/device/dispatch/status/change',
     method: 'post',
     data,
   })
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 14040a2..52080f5 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -1,63 +1,69 @@
 <!-- 审批流程组件 -->
 <script lang="ts" setup name="ApprovalRecord">
-import { onMounted } from 'vue'
-import { fetchApproval } from '@/api/approval'
-
+import { watch } from 'vue'
 const props = defineProps({
-  processId: String, // 流程实例id
-})
-
-const approvalRecordData = [
-  {
-    finishTime: '2121-8-9',
-    tableData: [
-      {
-        name: '任务ID',
-        data: 9,
-      },
-      {
-        name: '任务名称',
-        data: 'xxxx',
-      },
-    ],
+  approvalRecordData: { // 审批流程数据
+    type: Array,
+    default: () => [],
   },
-  {
-    finishTime: '2121-8-9',
+})
+const approvalRecord = ref([]) as any // 表格数据
+watch(() => props.approvalRecordData, (newValue) => {
+  const record = newValue[0] as any// 流程数据
+  const initiator = newValue[1] as any// 发起人
+
+  approvalRecord.value.push({
+    finishTime: initiator[0].finishTime,
     tableData: [
       {
-        name: '任务名称',
-        data: 'taskName',
-      },
-      {
-        name: '任务执行人',
-        data: 'assigneeName',
+        name: initiator[0].taskName,
+        data: initiator[0].assigneeName,
       },
       {
         name: '部门名称',
-        data: 'deptName',
+        data: initiator[0].deptName,
       },
-      {
-        name: '意见类别',
-        data: 'type',
-      },
-      {
-        name: '意见内容',
-        data: 'comment',
-      },
-      {
-        name: '任务耗时',
-        data: 'duration',
-      },
+      // {
+      //   name: '任务名称',
+      //   data: initiator[0].taskName,
+      // },
     ],
-  },
-]
-
-// 查询审批记录
-const getApprovalRecord = () => {
-  fetchApproval(props.processId!).then((res) => {
-    // 数据处理
   })
-}
+  record.forEach((item: any) => {
+    approvalRecord.value.push({
+      finishTime: item.finishTime,
+      tableData: [
+        {
+          name: item.taskName,
+          data: item.assigneeName,
+        },
+        // {
+        //   name: '任务执行人',
+        //   data: item.assigneeName,
+        // },
+        {
+          name: '部门名称',
+          data: item.deptName,
+        },
+        // {
+        //   name: '意见类别',
+        //   data: item.type',
+        // },
+        {
+          name: '意见内容',
+          data: item.comment || '无',
+        },
+        {
+          name: '任务耗时',
+          data: item.duration,
+        },
+      ],
+    })
+  })
+},
+{
+  deep: true,
+})
 
 // 自定义列背景色
 const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
@@ -74,24 +80,18 @@
     }
   }
 }
-
-onMounted(() => {
-  if (props.processId) {
-    getApprovalRecord()// 获取审批记录
-  }
-})
 </script>
 
 <template>
   <el-timeline>
     <el-timeline-item
-      v-for="(item, index) in approvalRecordData"
+      v-for="(item, index) in approvalRecord"
       :key="index"
       :timestamp="item.finishTime"
       placement="top"
-      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
-      :hollow="index === approvalRecordData.length - 1 ? true : false"
-      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+      :type="index === approvalRecord.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecord.length - 1 ? true : false"
+      :size="index === approvalRecord.length - 1 ? 'large' : 'normal'"
     >
       <el-card>
         <el-table
diff --git a/src/css/dialog.css b/src/css/dialog.css
index eb462a0..460584a 100644
--- a/src/css/dialog.css
+++ b/src/css/dialog.css
@@ -11,7 +11,8 @@
   color: #38adff;
   font-size: 12px;
   cursor: pointer;
-  background: url("@/assets/images/jiaojiao.png") no-repeat right center;
+
+  /* background: url("@/assets/images/jiaojiao.png") no-repeat right center; */
 }
 
 .tree_nav span:last-of-type {
@@ -32,7 +33,8 @@
   font-size: 12px;
   border-radius: 2px;
   border: 1px solid #d5dadf;
-  background: url("@/assets/images/list_search.png") no-repeat 10px center;
+
+  /* background: url("@/assets/images/list_search.png") no-repeat 10px center; */
   background-size: 14px 14px;
   margin-bottom: 14px;
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index e84dea6..824572f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -400,7 +400,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -504,7 +504,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               :disabled="buttonType === 'detail'"
             />
           </el-form-item>
@@ -565,7 +565,7 @@
               style="width: 100%;"
               :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
@@ -600,7 +600,7 @@
               :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
               style="width: 100%;"
               format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
               disabled
             />
           </el-form-item>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index 3569f76..75f0e06 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -983,7 +983,7 @@
                 clearable
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -997,7 +997,7 @@
                 :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
index f25fb24..094078a 100644
--- a/src/views/business/schedule/certPrint/certDetail.vue
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -537,7 +537,7 @@
                 class="full-width-input"
                 clearable
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
@@ -550,7 +550,7 @@
                 class="full-width-input"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD h:m:s a"
+                value-format="YYYY-MM-DD HH:mm:ss a"
                 disabled
               />
             </el-form-item>
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 9c1907c..9486425 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -39,8 +39,8 @@
   { text: '送样人', value: 'deliverer', align: 'center' },
   { text: '联系方式', value: 'customerPhone', align: 'center' },
   { text: '样品数量', value: 'sampleCount', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
-  { text: '接收状态', value: 'statusName', align: 'center', width: '80px' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '100px', filter: (row: IOrderList) => { return row.isUrgent == 1 ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == 1 ? 'color: red' : '' } },
+  { text: '接收状态', value: 'statusName', align: 'center', width: '100px' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180px' },
   { text: '备注', value: 'remark', align: 'center' },
 ])
diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue
index 0517076..c9679cb 100644
--- a/src/views/customer/advice/adviceList.vue
+++ b/src/views/customer/advice/adviceList.vue
@@ -234,7 +234,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="投诉查询开始时间"
             end-placeholder="投诉查询结束时间"
           />
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index cb6dad4..f68400b 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -384,7 +384,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="检查日期开始时间"
           end-placeholder="检查日期结束时间"
         />
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index c229bde..39615f3 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -389,7 +389,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="申请日期开始时间"
           end-placeholder="申请日期结束时间"
         />
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e9ad833..73b9c0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -1213,7 +1213,7 @@
               type="datetime"
               placeholder="请选择上传时间"
               format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
             <show-photo
               v-else-if="
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 56ecbc1..2ebb393 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -357,7 +357,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="筹建开始日期"
           end-placeholder="筹建结束日期"
         />
@@ -368,7 +368,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="到期开始日期"
           end-placeholder="到期结束日期"
         />
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b81c859..076ef51 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,6 +1,8 @@
+<!-- 培训计划审批表格 -->
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
+import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, IOptions, IPlanList, IlistApprovalQuery } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,7 +11,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -32,85 +34,38 @@
 const listQuery: Ref<IlistApprovalQuery> = ref({
   approvalStatus: props.status, // 审批状态
   formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-  createTime: '', // 创建时间
+  createEndTime: '', // 创建结束时间
+  createStartTime: '', // 创建开始时间
   deptId: '', // 部门id
   director: '', // 负责人
   effectiveCompany: '', // 实施单位
-  trainTime: '', // 培训时间
+  trainEndTime: '', // 培训结束时间
+  trainStartTime: '', // 培训开始时间
   offset: 1, // 当前页
   limit: 20, // 每页多少条
 })
+// 筛选时间段数据-创建时间
+const createTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
+// 筛选时间段数据-培训时间
+const trainTimeRange = ref<[DateModelType, DateModelType]>(['', ''])
 // 表格数据
 const list = ref<IPlanList[]>([])
 // 总数
 const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
 // 表头
 const columns = ref<TableColumn[]>([
-  {
-    text: '计划编号',
-    value: 'planNo',
-    align: 'center',
-  },
-  {
-    text: '培训名称',
-    value: 'planName',
-    align: 'center',
-  },
-  {
-    text: '培训对象',
-    value: 'trainPerson',
-    align: 'center',
-  },
-  {
-    text: '培训人数',
-    value: 'trainNumber',
-    align: 'center',
-  },
-  {
-    text: '培训学时',
-    value: 'trainHour',
-    align: 'center',
-  },
-  {
-    text: '培训时间',
-    value: 'trainTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '主管部门',
-    value: 'deptName',
-    align: 'center',
-  },
-  {
-    text: '实施单位',
-    value: 'effectiveCompany',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '培训内容',
-    value: 'trainContent',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    width: '180',
-    align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    width: '90',
-    align: 'center',
-  },
+  { text: '计划编号', value: 'planNo', align: 'center', width: '160' },
+  { text: '培训名称', value: 'planName', align: 'center' },
+  { text: '培训对象', value: 'trainPerson', align: 'center' },
+  { text: '培训人数', value: 'trainNumber', align: 'center' },
+  { text: '培训学时', value: 'trainHour', align: 'center' },
+  { text: '培训时间', value: 'trainTime', width: '180', align: 'center' },
+  { text: '主管部门', value: 'deptName', align: 'center' },
+  { text: '实施单位', value: 'effectiveCompany', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '培训内容', value: 'trainContent', align: 'center' },
+  { text: '创建时间', value: 'createTime', width: '180', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -126,6 +81,10 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  listQuery.value.createEndTime = createTimeRange.value[0] as string || ''
+  listQuery.value.createStartTime = createTimeRange.value[1] as string || ''
+  listQuery.value.trainEndTime = trainTimeRange.value[0] as string || ''
+  listQuery.value.trainStartTime = trainTimeRange.value[1] as string || ''
   getapprovalList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -165,7 +124,7 @@
 // 取消
 const handleCancel = (row: IPlanList) => {
   const params = {
-    taskId: row.taskId!,
+    processInstanceId: row.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -178,7 +137,7 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then(() => {
         ElMessage({
           type: 'success',
           message: '取消成功',
@@ -199,14 +158,18 @@
   listQuery.value = {
     approvalStatus: props.status, // 审批状态
     formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
-    createTime: '', // 创建时间
+    createEndTime: '', // 创建结束时间
+    createStartTime: '', // 创建开始时间
     deptId: '', // 部门id
     director: '', // 负责人
     effectiveCompany: '', // 实施单位
-    trainTime: '', // 培训时间
+    trainEndTime: '', // 培训结束时间
+    trainStartTime: '', // 培训开始时间
     offset: 1, // 当前页
     limit: 20, // 每页多少条
   }
+  createTimeRange.value = ['', '']
+  trainTimeRange.value = ['', '']
   fetchData(true)
 }
 // 主管部门下拉框
@@ -214,14 +177,28 @@
 
 // 导出
 const exportExcelBtn = () => {
-  // TODO: 审批列表导出
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    exportPlanList(listQuery.value).then((res) => {
+    const params = {
+      approvalStatus: props.status, // 审批状态
+      formId: SCHEDULE.TRAIN_APPROVAL, // 表单id
+      createEndTime: listQuery.value.createEndTime, // 创建结束时间
+      createStartTime: listQuery.value.createStartTime, // 创建开始时间
+      deptId: listQuery.value.deptId, // 部门id
+      director: listQuery.value.director, // 负责人
+      effectiveCompany: listQuery.value.effectiveCompany, // 实施单位
+      trainEndTime: listQuery.value.trainEndTime, // 培训结束时间
+      trainStartTime: listQuery.value.trainStartTime, // 培训开始时间
+      offset: 1, // 当前页
+      limit: 20, // 每页多少条
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportPlanList(params).then((res) => {
       const blob = new Blob([res.data])
       exportFile(blob, '培训计划列表.xlsx')
     })
@@ -244,7 +221,10 @@
 }
 // 跳转到详情
 const goDetail = (row: IPlanList) => {
-  $router.push(`trainPlanApprove/${props.status}/${row.id}`)
+  $router.push({
+    path: `trainPlanApprove/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 获取到组织信息
 const getDept = () => {
@@ -284,10 +264,6 @@
 const approvalSuccess = () => {
   fetchData(true)
 }
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
 
 // 点击数据后的操作按钮
 const clickBtn = (row: IPlanList, buttonType: string) => {
@@ -357,22 +333,26 @@
     >
       <search-item>
         <el-date-picker
-          v-model="listQuery.trainTime"
-          type="datetime"
-          placeholder="培训时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="trainTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="培训开始时间"
+          end-placeholder="培训结束时间"
         />
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="listQuery.createTime"
-          type="datetime"
-          placeholder="创建时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="createTimeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
           :disabled="buttonType === '详情'"
+          start-placeholder="创建开始时间"
+          end-placeholder="创建结束时间"
         />
       </search-item>
       <search-item>
@@ -400,15 +380,23 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <!-- 审批的导出功能去掉 -->
+        <!-- <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" /> -->
         <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
         <template #columns>
-          <el-table-column label="操作" align="center" :width="operationWidth">
+          <el-table-column label="操作" align="center" :width="operationWidth" fixed="right">
             <template #default="{ row }">
               <el-button
                 size="small"
@@ -423,7 +411,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '同意')"
               >
                 同意
@@ -433,7 +421,7 @@
                 size="small"
                 link
                 type="primary"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 3"
                 @click="clickBtn(row, '驳回')"
               >
                 驳回
@@ -443,7 +431,7 @@
                 size="small"
                 link
                 type="danger"
-                :disabled="row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中'"
+                :disabled="(row.approvalStatusName !== '待审批' && row.approvalStatusName !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
                 @click="clickBtn(row, '拒绝')"
               >
                 拒绝
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 3a145fa..dec5cc0 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -1,15 +1,17 @@
-<script lang="ts" setup name="SourceApprovalDetail">
-// 溯源供方审批详情
+<!-- 培训计划审批详情 -->
+<script lang="ts" setup name="PlanApprovalDetail">
 import { ref } from 'vue'
-import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton } from '../plan_interface'
 import baseInfoDetail from './baseinfoDetail.vue'
 import { getListDetail } from '@/api/system/plan'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
 const infoId = ref('') // id
 const buttonArray = ref<IButton[]>([])
-
+const approvalDialog = ref() // 审批对话框组件ref
+const approvalRecord = ref() // 审批流程组件ref
 const buttonsSet: { [key: string]: IButton[] } = {
   2: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
@@ -30,20 +32,21 @@
 }
 // 详情表单
 const dataForm = ref({
-  deptId: '',
-  deptName: '',
-  director: '',
-  effectiveCompany: '',
-  planName: '',
-  planNo: '',
-  remark: '',
-  trainAddress: '',
-  trainContent: '',
-  trainHour: '',
-  trainNumber: 0,
-  trainPerson: '',
-  taskId: '',
-  processId: '',
+  deptId: '', // 组织部门id-系统组织表
+  deptName: '', // 主管部门
+  director: '', // 负责人-人员名字
+  effectiveCompany: '', // 实施单位
+  planName: '', // 培训名称
+  planNo: '', // 计划编号
+  remark: '', // 备注
+  trainAddress: '', //	培训地点
+  trainContent: '', //	培训地点
+  trainHour: '', //	培训地点
+  trainNumber: 0, // 培训人数
+  trainPerson: '', // 培训对象
+  taskId: '', // 任务id（同意、驳回等操作使用）
+  processId: '', // 流程实例id
+  processInstanceId: '', // 流程实例id（取消操作使用）
   trainStaffList: [
     {
       company: '',
@@ -56,12 +59,13 @@
       technologyJob: '',
     },
   ],
-  trainTime: '',
+  trainTime: '', // 培训时间
 })
+// --------------------------表单详情通过前一页表格数据（路由）获取--------------------------
 // 获取表单详情
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
-    dataForm.value = res.data
+    dataForm.value.trainStaffList = res.data.trainStaffList
     // if (dataForm.value.approvalStatus) {
     //   // 待审批
     //   if (dataForm.value.approvalStatus == '2') {
@@ -93,12 +97,12 @@
 
 // 审批结束回调
 const approvalSuccess = () => {
-  getInfo()
+  close()
 }
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
+    processInstanceId: dataForm.value.processInstanceId!,
     comments: '',
   }
   ElMessageBox.confirm(
@@ -111,15 +115,27 @@
     },
   )
     .then(() => {
-      submitApproval('revoke', params).then((res) => {
+      cancelApproval(params).then((res) => {
         ElMessage({
           type: 'success',
           message: '取消成功',
         })
       })
+      close()
     })
 }
-const approvalDialog = ref()
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  fetchApproval(processId).then((res) => {
+    // 数据处理
+
+    approvalRecordData.value = res.data
+    console.log('-----------------------审批流程')
+    console.log(approvalRecordData.value)
+  })
+}
+
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
   switch (buttonType) {
@@ -137,8 +153,26 @@
       break
   }
 }
-onMounted(async () => {
-  dataForm.value.processId = $route.query.processId as string // 任务id
+
+// --------------------------表单从上一页表格中带出来、人员信息表格调培训计划详情调-------
+onMounted(() => {
+  dataForm.value.deptId = $route.query.deptId as string// 组织部门id-系统组织表
+  dataForm.value.deptName = $route.query.deptName as string// 主管部门
+  dataForm.value.director = $route.query.director as string// 负责人-人员名字
+  dataForm.value.effectiveCompany = $route.query.effectiveCompany as string// 实施单位
+  dataForm.value.planName = $route.query.planName as string// 培训名称
+  dataForm.value.planNo = $route.query.planNo as string// 计划编号
+  dataForm.value.remark = $route.query.remark as string // 备注
+  dataForm.value.trainAddress = $route.query.trainAddress as string//	培训地点
+  dataForm.value.trainContent = $route.query.trainContent as string//	培训地点
+  dataForm.value.trainHour = $route.query.trainHour as string//	培训地点
+  dataForm.value.trainNumber = parseInt($route.query.trainNumber as string)// 培训人数
+  dataForm.value.trainPerson = $route.query.trainPerson as string// 培训对象
+  dataForm.value.taskId = $route.query.taskId as string// 任务id（同意、驳回等操作使用）
+  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// 培训时间
+  getApprovalRecord(dataForm.value.processId)
 })
 </script>
 
@@ -155,10 +189,7 @@
       </template>
       <base-info-detail :form-inline="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <approval-record :process-id="dataForm.processId" />
-    </detail-block>
+
     <detail-block title="人员信息">
       <el-table
         :data="dataForm.trainStaffList"
@@ -179,6 +210,11 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
+    <!-- 审批弹出框组件 -->
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 2862696..631ebc6 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -216,9 +216,9 @@
 }
 // 打印
 const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '证书报告模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  id: 'main', // 需要打印元素的id
+  popTitle: '培训计划详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>培训计划详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
   standard: '',
   extarCss: '',
@@ -226,7 +226,7 @@
 </script>
 
 <template>
-  <app-container>
+  <app-container id="main">
     <detail-page :title="`培训计划-${textMap[pageType]}`">
       <template #btns>
         <el-button
@@ -244,6 +244,7 @@
           打印
         </el-button>
         <el-button
+          v-if="pageType !== 'detail'"
           type="primary"
           @click="preserve(ruleFormRef)"
         >
@@ -413,7 +414,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="55" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 8963167..ebcb081 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -31,6 +31,7 @@
   trainNumber: string // 培训人数
   trainPerson: string // 培训对象
   processId: string // 审批id
+  processInstanceId: string // 取消审批专用
   trainStaffList: IObject[] // 学员列表
   taskId?: string // 任务id
   trainTime: string // 培训时间
@@ -45,11 +46,13 @@
 export interface IlistApprovalQuery {
   approvalStatus: string // 审批状态
   formId: string // 表单id
-  createTime: string // 创建时间
+  createEndTime: string // 创建结束时间
+  createStartTime: string // 创建开始时间
   deptId: string // 部门id
   director: string // 负责人
   effectiveCompany: string // 实施单位
-  trainTime: string // 培训时间
+  trainEndTime: string // 培训结束时间
+  trainStartTime: string // 培训开始时间
   offset: number // 当前页
   limit: number // 每页多少条
 }
@@ -140,3 +143,24 @@
   trainStaffList: IaddPersonListType[] // 人员信息
   trainTime: string // 培训时间
 }
+
+// 培训计划审批
+export interface menuType {
+  name: string
+  value: string
+}
+// 培训计划审批
+export interface IButtonApprove {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index d623767..310ecb8 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -239,7 +239,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
         />
@@ -250,7 +250,7 @@
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          value-format="YYYY-MM-DD HH:mm:ss"
           start-placeholder="培训时间开始时间"
           end-placeholder="培训时间结束时间"
         />
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 8fc73a5..5f8dbbf 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,18 +1,12 @@
+<!-- 培训计划审批列表页 -->
 <script lang="ts" setup name="approve">
 import ListApproval from './components/listApproval.vue' // 全部
+import type { IButtonApprove, dictType, menuType } from './plan_interface'
 import useDictStore from '@/store/modules/dict'
-export interface menuType {
-  name: string
-  value: string
-}
-export interface IButton {
-  name: string
-  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
-}
+import { getDictByCode } from '@/api/system/dict'
+
 const dictStore = useDictStore()
-const buttonsSet: { [key: string]: IButton[] } = {
+const buttonsSet: { [key: string]: IButtonApprove[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
@@ -35,36 +29,30 @@
   ],
   审批中: [
     { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+    { name: '取消', type: 'info' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
 
 }
-const menus = ref<menuType[]>([
-  { name: '全部', value: '0' },
-  { name: '草稿箱', value: '1' },
-  { name: '待审批', value: '2' },
-  { name: '审批中', value: '3' },
-  { name: '已通过', value: '4' },
-  { name: '未通过', value: '5' },
-  { name: '已取消', value: '6' },
-])
+const menus = ref<menuType[]>([])
 // 当前tab
 const currentTab = ref('全部')
 // 当前审批状态
 const currentApprovalStatus = ref('0')
 // 当前需要显示的按钮列表
-const currentButtons = ref<IButton[]>([])
+const currentButtons = ref<IButtonApprove[]>([])
 currentButtons.value = buttonsSet['全部']
 // 审批类型字典
 const approvalStatusList = dictStore.approvalStatusListTow
@@ -77,12 +65,31 @@
   }
 }
 
+// 获取字典值
+async function getDict() {
+  // // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menus.value.push({
+        name: item.name,
+        value: `${item.value}`,
+      })
+    }
+  })
+}
+
 // 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
 onUnmounted(() => {
   sessionStorage.setItem('trinPlanListMenu', currentTab.value)
 })
 // 挂载的时候找到之前存过的审批类型
-onMounted(() => {
+onMounted(async () => {
+  await getDict()
   currentTab.value = sessionStorage.getItem('trinPlanListMenu') || '全部'
   sessionStorage.getItem('trinPlanListMenu') ? sessionStorage.removeItem('trinPlanListMenu') : ''
 })
@@ -114,7 +121,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }