diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index ec02fce..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -290,6 +290,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120" fixed="right">
             <template #default="{ row }">

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index ec02fce..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -290,6 +290,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index af1b086..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -219,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -354,6 +357,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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" fixed="right">
               <template #default="{ row }">

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index ec02fce..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -290,6 +290,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index af1b086..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -219,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -354,6 +357,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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" fixed="right">
               <template #default="{ row }">
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 0a0c971..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -3,12 +3,17 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -22,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -84,7 +93,18 @@
 const close = () => {
   $router.back()
 }
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -127,6 +147,13 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
@@ -151,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -185,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" 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/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index ec02fce..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -290,6 +290,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index af1b086..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -219,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -354,6 +357,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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" fixed="right">
               <template #default="{ row }">
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 0a0c971..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -3,12 +3,17 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -22,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -84,7 +93,18 @@
 const close = () => {
   $router.back()
 }
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -127,6 +147,13 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
@@ -151,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -185,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" 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/source/list.vue b/src/views/measure/source/list.vue
index 458cfd3..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -274,6 +274,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90" fixed="right">
             <template #default="{ row }">

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index ec02fce..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -290,6 +290,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index af1b086..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -219,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -354,6 +357,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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" fixed="right">
               <template #default="{ row }">
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 0a0c971..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -3,12 +3,17 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -22,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -84,7 +93,18 @@
 const close = () => {
   $router.back()
 }
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -127,6 +147,13 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
@@ -151,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -185,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" 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/source/list.vue b/src/views/measure/source/list.vue
index 458cfd3..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -274,6 +274,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b429d10..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {

diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
index 3eb6219..53cea4e 100644
--- a/src/components/ApprovalRecord/ApprovalRecord.vue
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -9,8 +9,8 @@
 })
 const typeMap: { [key: string]: string } = {
   1: '同意',
-  2: '驳回',
-  3: '拒绝',
+  2: '拒绝',
+  3: '驳回',
 }
 const approvalRecord = ref([]) as any // 表格数据
 watch(() => props.approvalRecordData, (newValue) => {
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 9ec3472..77e2576 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -410,7 +410,7 @@
         },
       },
       {
-        path: 'maintenanceList/:type/:id?/:processId?',
+        path: 'maintenanceList/:type/:id?/:approvalStatusName?/:processId?',
         name: 'maintenanceAdd',
         component: () => import('@/views/device/deviceMaintenance/components/maintenanceDetail.vue'),
         meta: {
diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts
index 4bafd0a..b6c115c 100644
--- a/src/views/device/deviceMaintenance/checkList_interface.ts
+++ b/src/views/device/deviceMaintenance/checkList_interface.ts
@@ -18,7 +18,7 @@
   managerPoinLocation: string // 管理点位置
   remark: string // 备注
   updateTime: null | string // 更新时间
-
+  approvalStatusName: string // 审批状态名称
 }
 // 标准配套设备表头类型
 export interface columnsType {
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 327b362..2d86a98 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -247,7 +247,9 @@
 }
 // 跳转到详情
 const goDetail = (row: IlistApproval, type: string) => {
-  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.processId}`)
+  console.log('-----')
+
+  $router.push(`/maintenance/maintenanceList/${type}/${row.id}/${row.approvalStatusName}/${row.processId}`)
 }
 // 获取到组织信息
 const getDept = () => {
diff --git a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
index 5c37fdf..860d610 100644
--- a/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
+++ b/src/views/device/deviceMaintenance/components/maintenanceDetail.vue
@@ -11,10 +11,13 @@
 import { getUserList } from '@/api/system/user'
 import type { deptType } from '@/views/device/standingBook/standingBook-interface'
 import type { userType } from '@/views/system/user/user-interface'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import addRow from '@/views/device/stateManage/components/selectDevice.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const from = ref('') // reject代表未通过-驳回
 const buttonArray = ref<string[]>([])
@@ -160,17 +163,13 @@
 }
 // -------------------------------------------------------------------------
 
-// 审批结束回调
-const approvalSuccess = () => {
-}
-
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: formInline.value.taskId!,
-    comments: '',
+    processInstanceId: formInline.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -180,15 +179,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then(() => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -410,10 +405,30 @@
     usePersonOptions.value = res.data.rows
   })
 }
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
 onMounted(async () => {
   await fetchUserList()
   await fetchDeptTreeList()
   formInline.value.processId = $route.params.processId as string // 任务id
+  formInline.value.approvalStatusName = $route.params.approvalStatusName as string // 任务id
+  if (formInline.value.approvalStatusName !== '草稿箱') {
+    getApprovalRecord(formInline.value.processId) // 查询审批记录
+  }
 })
 </script>
 
@@ -555,9 +570,9 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType === 'detail'" title="审批流程">
+    <detail-block v-if="formInline.approvalStatusName !== '草稿箱'" title="审批流程">
       <!-- 审批流程 -->
-      <approval-record :process-id="formInline.processId" />
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
     </detail-block>
     <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
     <!-- 借用设备列表 -->
diff --git a/src/views/measure/price/list.vue b/src/views/measure/price/list.vue
index ec02fce..8961499 100644
--- a/src/views/measure/price/list.vue
+++ b/src/views/measure/price/list.vue
@@ -290,6 +290,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="120" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index af1b086..c0c3744 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -219,8 +219,11 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+const goDetail = (row: Omit<ISupplier, 'traceSupplierPersonList'>) => {
+  $router.push({
+    path: `approve/${props.status}/${row.id}`,
+    query: { ...row },
+  })
 }
 // 新建溯源供方
 const add = () => {
@@ -354,6 +357,13 @@
           :data="list" :total="total" :columns="columns" :query="listQuery"
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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" fixed="right">
               <template #default="{ row }">
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 0a0c971..8d9d22d 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -3,12 +3,17 @@
 import { ref } from 'vue'
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import type { ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { cancelApproval, submitApproval } from '@/api/approval'
+import { cancelApproval, fetchApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
+
+const approvalRecord = ref() // 审批流程组件ref
 const infoId = ref('') // id
 const approvalType = ref('')
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
+
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -22,44 +27,48 @@
 // 溯源供方详情表单
 const dataForm = ref<ISupplier>({
   id: '',
-  businessContent: '',
-  supplierName: '',
-  supplierNo: '',
-  bankAccount: '',
-  bankAccountNumber: '',
-  bankName: '',
-  briefName: '',
-  businessScope: '',
-  companyAddress: '',
-  companyArea: '',
-  companyCity: '',
-  companyCountry: '',
-  companyProvince: '',
-  companyAreaName: '',
-  companyCityName: '',
-  companyCountryName: '',
-  companyProvinceName: '',
-  createTime: '',
-  director: '',
-  fax: '',
-  invoiceAddress: '',
-  invoiceArea: '',
-  invoiceCity: '',
-  invoiceCountry: '',
-  invoiceProvince: '',
-  invoiceAreaName: '',
-  invoiceCityName: '',
-  invoiceCountryName: '',
-  invoiceProvinceName: '',
-  mailbox: '',
-  minioFileName: '',
-  mobile: '',
-  phone: '',
-  postalCode: '',
-  remark: '',
-  taxNumber: '',
-  website: '',
-  traceSupplierPersonList: [],
+  businessContent: '', // 业务内容
+  supplierName: '', // 公司名称
+  supplierNo: '', //	溯源供方编号（列表、更新接口参数）
+  bankAccount: '', // 银行账户名
+  bankAccountNumber: '', // 银行账号
+  bankName: '', // 银行名称
+  briefName: '', // 公司简称
+  businessScope: '', // 公司业务范围
+  companyAddress: '', // 公司地址-详细地址
+  companyArea: '', // 公司地址-区
+  companyCity: '', //	公司地址-市
+  companyCountry: '', // 公司地址-国家
+  companyProvince: '', // 公司地址-省
+  companyAreaName: '', // 公司地址-区名
+  companyCityName: '', //	公司地址-市名
+  companyCountryName: '', // 公司地址-国家名
+  companyProvinceName: '', // 公司地址-省名
+  createTime: '', // 创建时间
+  director: '', // 负责人
+  fax: '', // 传真
+  invoiceAddress: '', // 开票地址-详细地址
+  invoiceArea: '', // 开票地址-区
+  invoiceCity: '', //	开票地址-市
+  invoiceCountry: '', // 开票地址-国家
+  invoiceProvince: '', // 开票地址-省
+  invoiceAreaName: '', // 开票地址-区
+  invoiceCityName: '', //	开票地址-市
+  invoiceCountryName: '', // 开票地址-国家
+  invoiceProvinceName: '', // 开票地址-省
+  mailbox: '', // 邮箱
+  minioFileName: '', // 上传文件返回名称
+  mobile: '', // 手机
+  phone: '', // 电话
+  postalCode: '', //	邮编
+  remark: '', // 备注
+  taxNumber: '', // 税号
+  website: '', //	网址
+  traceSupplierPersonList: [], // 溯源供方人员列表
+  taskId: '', // 任务id, 流程审批用
+  processId: '', // 流程实例id
+  approvalStatus: '', // 审批状态
+  approvalStatusName: '', // 审批状态名称
 })
 // 获取表单详情
 const getInfo = () => {
@@ -84,7 +93,18 @@
 const close = () => {
   $router.back()
 }
-
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
+}
 // 审批结束回调
 const approvalSuccess = () => {
   getInfo()
@@ -127,6 +147,13 @@
       break
   }
 }
+onMounted(() => {
+  dataForm.value.processId = $route.query.processId as string// 流程实例id
+  approvalStatusName.value = $route.query.approvalStatusName as string
+  if (approvalStatusName.value !== '草稿箱') {
+    getApprovalRecord(dataForm.value.processId) // 查询审批记录
+  }
+})
 </script>
 
 <template>
@@ -151,20 +178,6 @@
       </template>
       <base-info-detail :form-data="dataForm" />
     </detail-page>
-    <detail-block title="审批流程">
-      <!-- 审批流程 -->
-      <div>
-        <el-timeline>
-          <el-timeline-item
-            v-for="(activity, index) in approvalActivities"
-            :key="index"
-            :timestamp="activity.timestamp"
-          >
-            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </detail-block>
     <detail-block title="人员信息">
       <el-table
         :data="traceSupplierPersonList"
@@ -185,6 +198,10 @@
         </el-table-column>
       </el-table>
     </detail-block>
+    <detail-block v-if="approvalStatusName !== '草稿箱'" 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/source/list.vue b/src/views/measure/source/list.vue
index 458cfd3..e2778fe 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -274,6 +274,13 @@
         :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="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="90" fixed="right">
             <template #default="{ row }">
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b429d10..40101f9 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -10,7 +10,6 @@
 import { exportPlanList, getApprovalDelete, getDeptTree, getListDelete, getListSubmit, getapprovalList } from '@/api/measure/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { exportFile } from '@/utils/exportUtils'
 import { cancelApproval } from '@/api/approval'
 const props = defineProps({
   status: {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 8fe0388..38fca62 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -67,16 +67,6 @@
 const getInfo = () => {
   getListDetail({ id: infoId.value }).then((res) => {
     dataForm.value.trainStaffList = res.data.trainStaffList
-    // if (dataForm.value.approvalStatus) {
-    //   // 待审批
-    //   if (dataForm.value.approvalStatus == '2') {
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    //   else if (dataForm.value.approvalStatus == '3') { // 审批中
-    //     // todo：判断当前用户是否为发起人
-    //     buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-    //   }
-    // }
   })
 }
 getInfo()