diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d4ac6a6..dc2d9f9 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -26,6 +26,7 @@
   time: string // 领用时间
   applyDesc: string // 申请说明
   approvalStatus: string // 	审批状态
+  approvalStatusName: string // 审批状态名称
   processResult: string // 	处置结果
   applyType: string // 申请类型 领用0
   createUser: string // 创建人

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d4ac6a6..dc2d9f9 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -26,6 +26,7 @@
   time: string // 领用时间
   applyDesc: string // 申请说明
   approvalStatus: string // 	审批状态
+  approvalStatusName: string // 审批状态名称
   processResult: string // 	处置结果
   applyType: string // 申请类型 领用0
   createUser: string // 创建人
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
new file mode 100644
index 0000000..4e503c5
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -0,0 +1,172 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList } from './status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([])
+
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d4ac6a6..dc2d9f9 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -26,6 +26,7 @@
   time: string // 领用时间
   applyDesc: string // 申请说明
   approvalStatus: string // 	审批状态
+  approvalStatusName: string // 审批状态名称
   processResult: string // 	处置结果
   applyType: string // 申请类型 领用0
   createUser: string // 创建人
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
new file mode 100644
index 0000000..4e503c5
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -0,0 +1,172 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList } from './status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([])
+
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 0ef0e90..6f258bc 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -1,27 +1,78 @@
+// 设备状态管理搜索
+
+export interface ISearchQuery {
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyUnit: string // 申请单位
+  approvalStatus: number // 审批状态
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  ids: [] // 选中设备数据
+  limit: number
+  offset: number
+  applyType: string // 申请类型
+  formId: string // 表单id
+}
+
 // 设备闲置申请表格行
-export interface TableRow {
-  applyNo: string
-  applyPerson: string
-  applyType: string
-  applyTypeName: string
-  applyUnit: string
-  approvalStatus: string
-  approvalStatusName: string
-  createTime: string
-  createUser: string
-  equipmentName: string
-  equipmentNo: string
-  fileList: string
-  id: number
-  isDel: number
-  managerState: string
-  managerStateName: string
-  modelNo: string
-  processId: string
-  processResult: string
-  remark: string
+export interface ITableRow {
+  applyNo: string // 申请编号
+  applyPerson: string // 申请名称
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请部门
+  approvalStatus: string // 申请状态码
+  approvalStatusName: string // 申请状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  fileList: string // 文件列表
+  id: number // 主键id
+  isDel: number // 删除标记
+  managerState: string //  管理状态
+  managerStateName: string // 管理状态名称
+  modelNo: string // 型号
+  processId: string // 流程id
+  processResult: string // 流程结果
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string // 时间
+  updateTime: string // 修改时间
+  version: string // 版本
+}
+
+// 删除/提交/取消
+export interface Iapprove {
+  id: string
   taskId: string
-  time: string
-  updateTime: string
-  version: string
+  formId?: string
+  processInstanceId?: string
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
 }

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d4ac6a6..dc2d9f9 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -26,6 +26,7 @@
   time: string // 领用时间
   applyDesc: string // 申请说明
   approvalStatus: string // 	审批状态
+  approvalStatusName: string // 审批状态名称
   processResult: string // 	处置结果
   applyType: string // 申请类型 领用0
   createUser: string // 创建人
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
new file mode 100644
index 0000000..4e503c5
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -0,0 +1,172 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList } from './status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([])
+
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 0ef0e90..6f258bc 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -1,27 +1,78 @@
+// 设备状态管理搜索
+
+export interface ISearchQuery {
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyUnit: string // 申请单位
+  approvalStatus: number // 审批状态
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  ids: [] // 选中设备数据
+  limit: number
+  offset: number
+  applyType: string // 申请类型
+  formId: string // 表单id
+}
+
 // 设备闲置申请表格行
-export interface TableRow {
-  applyNo: string
-  applyPerson: string
-  applyType: string
-  applyTypeName: string
-  applyUnit: string
-  approvalStatus: string
-  approvalStatusName: string
-  createTime: string
-  createUser: string
-  equipmentName: string
-  equipmentNo: string
-  fileList: string
-  id: number
-  isDel: number
-  managerState: string
-  managerStateName: string
-  modelNo: string
-  processId: string
-  processResult: string
-  remark: string
+export interface ITableRow {
+  applyNo: string // 申请编号
+  applyPerson: string // 申请名称
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请部门
+  approvalStatus: string // 申请状态码
+  approvalStatusName: string // 申请状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  fileList: string // 文件列表
+  id: number // 主键id
+  isDel: number // 删除标记
+  managerState: string //  管理状态
+  managerStateName: string // 管理状态名称
+  modelNo: string // 型号
+  processId: string // 流程id
+  processResult: string // 流程结果
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string // 时间
+  updateTime: string // 修改时间
+  version: string // 版本
+}
+
+// 删除/提交/取消
+export interface Iapprove {
+  id: string
   taskId: string
-  time: string
-  updateTime: string
-  version: string
+  formId?: string
+  processInstanceId?: string
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
 }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 6c6ed79..2253668 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -2,7 +2,9 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import type { IdeviceList, IdeviceListQuery } from '../status-interface'
 import addRow from './addRow.vue'
+import SelectDeviceDialog from './selectDeviceDialog.vue'
 import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -14,7 +16,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
-import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 
@@ -25,7 +27,10 @@
 const ruleFormRef2 = ref() // from组件
 const title = ref('')
 const name = ref('')
-const borrowList = ref<borrowDeviceType[]>([])
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const selectIndex = ref() // 点击选择的index--点击第几行
+const borrowList = ref<IdeviceList[]>([])
 interface EquipmentListRow {
   equipmentId: string
 }
@@ -194,7 +199,6 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   fetchData()
-  // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
   if (isDevice.value) {
@@ -203,7 +207,6 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        // borrowList.value = res.data.equipmentList 接口返回数据为空
         borrowList.value = res.data.equipmentInfoList
       })
     }
@@ -248,6 +251,7 @@
         if (title.value === '新建') {
           addApply(params).then((res) => {
             if (res.code === 200) {
+              ruleForm2.value.id = res.data
               ElMessage.success('保存成功')
             }
           })
@@ -256,6 +260,7 @@
           editApply(params).then((res) => {
             if (res.code === 200) {
               // 成功
+              ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
               $router.go(-1)
             }
@@ -489,52 +494,50 @@
   },
 ])
 const addRowRef = ref()
-// 添加行
-const addRowBtn = () => {
-  // if (checkPersonList()) {
-  //   setAllRowReadable()
-  //   console.log(borrowList.value)
-  //   borrowList.value.push({
-  //     equipmentName: '', // 设备名称
-  //     createUser: userInfo.$state.id, // 当前用户id   1
-  //     equipmentId: '', // 设备id 1
-  //     equipmentNo: '', // 设备编号
-  //     modelNo: '', // 型号
-  //     measureRange: '', // 测量范围 1
-  //     useDept: '', // 使用部门 1
-  //     usePerson: '', // 使用人 1
-  //     validDate: '', // 有效日期
-  //     edit: true,
-  //   })
-  // }
-  addRowRef.value.initDialog({ title: '' })
-}
 const SelectionList = ref()
 // 表格选中
-const handleSelectionChange = (e) => {
+const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 删除行
-// const removeRowBtn = () => {
-//   const removeArr = borrowList.value.filter(item => item.remove !== '')
-//   if (removeArr.length) {
-//     ElMessageBox.confirm(
-//       '确认删除选中的数据吗？',
-//       '提示',
-//       {
-//         confirmButtonText: '确认',
-//         cancelButtonText: '取消',
-//         type: 'warning',
-//       },
-//     ).then(() => {
-//       borrowList.value = borrowList.value.filter(item => item.remove === '')
-//       ElMessage.success('删除成功')
-//     })
-//   }
-//   else {
-//     ElMessage.warning('请先选择需要删除的数据')
-//   }
-// }
+
+// 添加行
+const addRowButton = () => {
+  const index = borrowList.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  borrowList.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+const delRowButton = () => {
+  if (SelectionList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    SelectionList.value.forEach((item: IdeviceListQuery) => {
+      borrowList.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          borrowList.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 删除行
 const removeRowBtn = () => {
   borrowList.value = borrowList.value.filter((item) => {
@@ -542,7 +545,7 @@
   })
 }
 // 借用设备列表添加
-const addRowMethods = (row) => {
+const addRowMethods = (row: IdeviceListQuery) => {
   if (isDevice.value) {
     // 设备借用
     borrowList.value = [...borrowList.value, ...row]
@@ -608,6 +611,45 @@
     return false
   }
 })
+
+// 点击选择
+const handleSelect = (index: number, row: borrowDeviceType) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = borrowList.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        borrowList.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = borrowList.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    borrowList.value.splice(selectIndex.value, 1, val[0])
+  }
+}
 </script>
 
 <template>
@@ -774,52 +816,58 @@
       </el-form>
     </detail-page>
     <div>
+      <!-- 表格 -->
       <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
-            添加行
+          <el-button v-if="title !== '详情'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
-          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowButton">
+            增加行
+          </el-button>
+          <el-button v-if="title !== '详情'" type="info" @click="delRowButton">
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="38" />
+        <el-table
+          :data="borrowList || []"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="title !== '详情'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
-            <template #header>
-              <span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <span>{{ scope.row[item.value]
-              }}</span>
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (title !== '详情')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </template>
           </el-table-column>
         </el-table>
       </detail-block>
       <!-- <detail-block v-if="title !== '新建'" title="审批流程">
-        <el-timeline>
-          <el-timeline-item timestamp="2018/4/12" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/12 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/3" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/3 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/2" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/2 20:46</p>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
       </detail-block> -->
     </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
   </app-container>
 </template>
 

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d4ac6a6..dc2d9f9 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -26,6 +26,7 @@
   time: string // 领用时间
   applyDesc: string // 申请说明
   approvalStatus: string // 	审批状态
+  approvalStatusName: string // 审批状态名称
   processResult: string // 	处置结果
   applyType: string // 申请类型 领用0
   createUser: string // 创建人
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
new file mode 100644
index 0000000..4e503c5
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -0,0 +1,172 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList } from './status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([])
+
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 0ef0e90..6f258bc 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -1,27 +1,78 @@
+// 设备状态管理搜索
+
+export interface ISearchQuery {
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyUnit: string // 申请单位
+  approvalStatus: number // 审批状态
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  ids: [] // 选中设备数据
+  limit: number
+  offset: number
+  applyType: string // 申请类型
+  formId: string // 表单id
+}
+
 // 设备闲置申请表格行
-export interface TableRow {
-  applyNo: string
-  applyPerson: string
-  applyType: string
-  applyTypeName: string
-  applyUnit: string
-  approvalStatus: string
-  approvalStatusName: string
-  createTime: string
-  createUser: string
-  equipmentName: string
-  equipmentNo: string
-  fileList: string
-  id: number
-  isDel: number
-  managerState: string
-  managerStateName: string
-  modelNo: string
-  processId: string
-  processResult: string
-  remark: string
+export interface ITableRow {
+  applyNo: string // 申请编号
+  applyPerson: string // 申请名称
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请部门
+  approvalStatus: string // 申请状态码
+  approvalStatusName: string // 申请状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  fileList: string // 文件列表
+  id: number // 主键id
+  isDel: number // 删除标记
+  managerState: string //  管理状态
+  managerStateName: string // 管理状态名称
+  modelNo: string // 型号
+  processId: string // 流程id
+  processResult: string // 流程结果
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string // 时间
+  updateTime: string // 修改时间
+  version: string // 版本
+}
+
+// 删除/提交/取消
+export interface Iapprove {
+  id: string
   taskId: string
-  time: string
-  updateTime: string
-  version: string
+  formId?: string
+  processInstanceId?: string
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
 }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 6c6ed79..2253668 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -2,7 +2,9 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import type { IdeviceList, IdeviceListQuery } from '../status-interface'
 import addRow from './addRow.vue'
+import SelectDeviceDialog from './selectDeviceDialog.vue'
 import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -14,7 +16,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
-import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 
@@ -25,7 +27,10 @@
 const ruleFormRef2 = ref() // from组件
 const title = ref('')
 const name = ref('')
-const borrowList = ref<borrowDeviceType[]>([])
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const selectIndex = ref() // 点击选择的index--点击第几行
+const borrowList = ref<IdeviceList[]>([])
 interface EquipmentListRow {
   equipmentId: string
 }
@@ -194,7 +199,6 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   fetchData()
-  // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
   if (isDevice.value) {
@@ -203,7 +207,6 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        // borrowList.value = res.data.equipmentList 接口返回数据为空
         borrowList.value = res.data.equipmentInfoList
       })
     }
@@ -248,6 +251,7 @@
         if (title.value === '新建') {
           addApply(params).then((res) => {
             if (res.code === 200) {
+              ruleForm2.value.id = res.data
               ElMessage.success('保存成功')
             }
           })
@@ -256,6 +260,7 @@
           editApply(params).then((res) => {
             if (res.code === 200) {
               // 成功
+              ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
               $router.go(-1)
             }
@@ -489,52 +494,50 @@
   },
 ])
 const addRowRef = ref()
-// 添加行
-const addRowBtn = () => {
-  // if (checkPersonList()) {
-  //   setAllRowReadable()
-  //   console.log(borrowList.value)
-  //   borrowList.value.push({
-  //     equipmentName: '', // 设备名称
-  //     createUser: userInfo.$state.id, // 当前用户id   1
-  //     equipmentId: '', // 设备id 1
-  //     equipmentNo: '', // 设备编号
-  //     modelNo: '', // 型号
-  //     measureRange: '', // 测量范围 1
-  //     useDept: '', // 使用部门 1
-  //     usePerson: '', // 使用人 1
-  //     validDate: '', // 有效日期
-  //     edit: true,
-  //   })
-  // }
-  addRowRef.value.initDialog({ title: '' })
-}
 const SelectionList = ref()
 // 表格选中
-const handleSelectionChange = (e) => {
+const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 删除行
-// const removeRowBtn = () => {
-//   const removeArr = borrowList.value.filter(item => item.remove !== '')
-//   if (removeArr.length) {
-//     ElMessageBox.confirm(
-//       '确认删除选中的数据吗？',
-//       '提示',
-//       {
-//         confirmButtonText: '确认',
-//         cancelButtonText: '取消',
-//         type: 'warning',
-//       },
-//     ).then(() => {
-//       borrowList.value = borrowList.value.filter(item => item.remove === '')
-//       ElMessage.success('删除成功')
-//     })
-//   }
-//   else {
-//     ElMessage.warning('请先选择需要删除的数据')
-//   }
-// }
+
+// 添加行
+const addRowButton = () => {
+  const index = borrowList.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  borrowList.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+const delRowButton = () => {
+  if (SelectionList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    SelectionList.value.forEach((item: IdeviceListQuery) => {
+      borrowList.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          borrowList.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 删除行
 const removeRowBtn = () => {
   borrowList.value = borrowList.value.filter((item) => {
@@ -542,7 +545,7 @@
   })
 }
 // 借用设备列表添加
-const addRowMethods = (row) => {
+const addRowMethods = (row: IdeviceListQuery) => {
   if (isDevice.value) {
     // 设备借用
     borrowList.value = [...borrowList.value, ...row]
@@ -608,6 +611,45 @@
     return false
   }
 })
+
+// 点击选择
+const handleSelect = (index: number, row: borrowDeviceType) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = borrowList.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        borrowList.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = borrowList.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    borrowList.value.splice(selectIndex.value, 1, val[0])
+  }
+}
 </script>
 
 <template>
@@ -774,52 +816,58 @@
       </el-form>
     </detail-page>
     <div>
+      <!-- 表格 -->
       <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
-            添加行
+          <el-button v-if="title !== '详情'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
-          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowButton">
+            增加行
+          </el-button>
+          <el-button v-if="title !== '详情'" type="info" @click="delRowButton">
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="38" />
+        <el-table
+          :data="borrowList || []"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="title !== '详情'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
-            <template #header>
-              <span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <span>{{ scope.row[item.value]
-              }}</span>
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (title !== '详情')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </template>
           </el-table-column>
         </el-table>
       </detail-block>
       <!-- <detail-block v-if="title !== '新建'" title="审批流程">
-        <el-timeline>
-          <el-timeline-item timestamp="2018/4/12" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/12 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/3" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/3 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/2" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/2 20:46</p>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
       </detail-block> -->
     </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index bf71edd..8f9aeb4 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, detailApply } from '@/api/device/borrow'
-import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
 const $router = useRouter()

diff --git a/src/api/business/cert.ts b/src/api/business/cert.ts
new file mode 100644
index 0000000..7fa6610
--- /dev/null
+++ b/src/api/business/cert.ts
@@ -0,0 +1,50 @@
+/**
+ * 证书打印
+*/
+import request from '../index'
+import type { ICertApprove, ICertExport, ICertInitiate, ICertPrintSearch } from '@/views/business/schedule/certPrint/cert-interface.ts'
+
+// 证书打印列表
+export function getCertList(data: ICertPrintSearch) {
+  return request({
+    url: `/business/certificatePrint/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 发起申请
+export function submitApproval(data: ICertInitiate) {
+  return request({
+    url: '/business/certificatePrint/submitApproval',
+    method: 'post',
+    data,
+  })
+}
+
+// 同意
+export function agreeCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/agree',
+    method: 'post',
+    data,
+  })
+}
+
+// 拒绝
+export function refuseCert(data: ICertApprove) {
+  return request({
+    url: '/business/certificatePrint/refuse',
+    method: 'post',
+    data,
+  })
+}
+
+// 证书导出
+export function exportCert(data: ICertExport) {
+  return request({
+    url: '/business/certificatePrint/export',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/device/borrow.ts b/src/api/device/borrow.ts
index c30f801..c5e1f79 100644
--- a/src/api/device/borrow.ts
+++ b/src/api/device/borrow.ts
@@ -1,8 +1,9 @@
 // 设备借用相关接口api
 import request from '../index'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ IlistQuery } from '@/views/device/borrow/borrow'
+
 // 设备借用申请列表
-export function getApplyList(data: searchType) {
+export function getApplyList(data: IlistQuery) {
   return request({
     url: `/equipmentApply/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -69,7 +70,7 @@
   })
 }
 // 设备借用申请导出
-export function exportApply(data: object) {
+export function exportApply(data: IlistQuery) {
   return request({
     url: '/equipmentApply/exportList',
     method: 'post',
diff --git a/src/api/device/stateManage.ts b/src/api/device/stateManage.ts
index 85334a4..5bbaa24 100644
--- a/src/api/device/stateManage.ts
+++ b/src/api/device/stateManage.ts
@@ -1,7 +1,9 @@
 // 状态管理相关接口api
 import request from '../index'
+import type { ISearchQuery, ITableRow, Iapprove } from '@/views/device/stateManage/components/status-interface.ts'
+
 // 设备申请列表
-export function getStatusList(data: any) {
+export function getStatusList(data: ISearchQuery) {
   return request({
     url: `/meter/stateManage/stateManageList?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
@@ -9,7 +11,7 @@
   })
 }
 // 状态管理新建
-export function addStatus(data: object) {
+export function addStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/addStateManageInfo',
     method: 'post',
@@ -18,7 +20,7 @@
 }
 
 // 状态管理编辑
-export function updateStatus(data: object) {
+export function updateStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/updateStateManageInfo',
     method: 'post',
@@ -27,7 +29,7 @@
 }
 
 // 状态管理删除
-export function deleteStatus(data: object) {
+export function deleteStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/deleteStateManageList',
     method: 'post',
@@ -35,7 +37,7 @@
   })
 }
 // 状态管理取消
-export function cancelStatus(data: object) {
+export function cancelStatus(data: Iapprove) {
   return request({
     url: '/approval/operate/revoke',
     method: 'post',
@@ -43,7 +45,7 @@
   })
 }
 // 状态管理提交
-export function submitStatus(data: object) {
+export function submitStatus(data: Iapprove) {
   return request({
     url: '/meter/stateManage/submitStandardEquipmentApply',
     method: 'post',
@@ -51,7 +53,7 @@
   })
 }
 // 状态管理详情
-export function detailStatus(data: object) {
+export function detailStatus(data: ITableRow) {
   return request({
     url: '/meter/stateManage/selectStateManageInfo',
     method: 'post',
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index fb6758e..2fe1125 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -530,7 +530,7 @@
     redirect: '/device/borrow/borrowapply',
     name: 'Borrow',
     meta: {
-      title: '设备领用',
+      title: '设备借用',
       icon: 'ep:key',
       auth: '/device/borrow',
     },
@@ -555,6 +555,18 @@
           auth: '/device/borrow/borrowhandle',
         },
       },
+      {
+        path: 'borrowDetail',
+        name: 'borrowListDetail',
+        component: () => import('@/views/device/borrow/editHandle.vue'),
+        meta: {
+          title: '设备借用处理',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/borrow/borrowhandle',
+        },
+      },
     ],
   },
 
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
index df0ba5c..4f274f3 100644
--- a/src/views/business/schedule/certPrint/cert-interface.ts
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -37,6 +37,8 @@
   createTime: string // 生成时间
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态
+  taskId?: string // 任务id
+  id: string // 主键
 }
 
 // 证书详情
@@ -84,3 +86,24 @@
   mesureContent: string // 检定项目
   remark: string // 备注
 }
+
+// 证书导出
+export interface ICertExport {
+  orderId: number
+  reason: string
+  sampleId: number
+  status: string
+}
+
+// 证书同意/拒绝
+export interface ICertApprove {
+  comments: number
+  id?: string
+  taskId: string
+}
+
+// 证书发起
+export interface ICertInitiate {
+  formId: number
+  id: string
+}
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
index c6e9db4..21b7a5f 100644
--- a/src/views/business/schedule/certPrint/certList.vue
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -5,13 +5,17 @@
 import { ElLoading, ElMessage } from 'element-plus'
 import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
 import DistributeDialog from './components/distributeDialog.vue'
+import ApprovalDialogPart from './components/ApprovalDialogPart.vue'
 import BarCodeBind from '@/components/BarCodeBind/index.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDictByCode } from '@/api/system/dict'
 import { exportTaskList, getTaskList } from '@/api/business/task'
+import { exportCert, getCertList, submitApproval } from '@/api/business/cert'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import type { dictType } from '@/global'
+
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -37,6 +41,7 @@
   offset: 1,
   limit: 20,
 })
+const approvalDialogPart = ref() // 审批组件
 // --------------获取所需字典值----------------
 const certificationClassList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
@@ -49,16 +54,16 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificationReportName', align: 'center' },
+  { text: '证书编号', value: 'certificationReportCode', width: '110', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', width: '120', align: 'center' },
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
-  { text: '型号', value: 'sampleModel', align: 'center' },
-  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderNo', align: 'center' },
-  { text: '检校类别', value: 'customerNo', align: 'center' },
-  { text: '检定人员', value: 'customerName', align: 'center' },
-  { text: '证书类型', value: 'certificateReportTypeName', align: 'center' },
+  { text: '型号', value: 'sampleModel', width: '120', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', width: '120', align: 'center' },
+  { text: '委托书编号', value: 'orderNo', width: '120', align: 'center' },
+  { text: '检校类别', value: 'customerNo', width: '120', align: 'center' },
+  { text: '检定人员', value: 'customerName', width: '120', align: 'center' },
+  { text: '证书类型', value: 'certificateReportTypeName', width: '120', align: 'center' },
   { text: '打印状态', value: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
   { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
 ])
@@ -110,13 +115,12 @@
     listQuery.value.offset = 1
   }
   // 模拟数据
+  loadingTable.value = false
   list.value = [
-    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
+    { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '0', printStatusName: '未打印', certificateReportTypeName: '自检', approvalStatusName: '待审批', taskId: 100, id: 10 },
     { certificationId: '1', certificationReportCode: '12345614', certificationReportName: '力学检定证书', orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', sampleModel: 'xx', manufacturingNo: 'xx', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', createTime: '2023-02-01 08:00:00', printNum: 0, printStatus: '1', printStatusName: '已打印', certificateReportTypeName: '自检', approvalStatusName: '待审批' },
   ]
-  loadingTable.value = false
-  console.log(listQuery.value)
-  // getTaskList(listQuery.value).then((response) => {
+  // getCertList(listQuery.value).then((response) => {
   //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
@@ -146,6 +150,7 @@
     offset: 1,
     limit: 20,
   }
+  fetchData(true)
 }
 // 点击详情
 const handleDetail = (row: ICerPrintList) => {
@@ -154,10 +159,21 @@
 
 // 点击分发， 弹窗
 const distributeDialogRef = ref()
-const handleDistribute = (row: ICerPrintList) => {
+const handleDistribute = (row: ICerPrintList, status: string) => {
+  if (status === 'agree') {
+    approvalDialogPart.value.initDialog('agree', row.taskId)
+  }
+  else {
+    approvalDialogPart.value.initDialog('refuse', row.taskId, row.id)
+  }
   // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -195,6 +211,13 @@
   loading.close()
 }
 
+// 打印
+const bindLabel = () => {
+  // exportCert({orderId:row.orderId,reason:row.reason,sampleId:row.sampleId,status:row.status}).then(res=>{
+  //   console.log(res)
+  // })
+}
+
 // 打印列表
 function printList() {
   // 打印列
@@ -226,6 +249,7 @@
 
 <template>
   <app-container>
+    <approval-dialog-part ref="approvalDialogPart" @on-success="approvalSuccess" />
     <div class="float-radio-buttons">
       <!-- 三级菜单 -->
       <el-radio-group v-model="currentMenu">
@@ -295,10 +319,10 @@
               <el-button v-if="listQuery.printNum === 0 || (listQuery.approvalStatus === '3')" size="small" link type="primary" @click="bindLabel(row)">
                 打印
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'agree')">
                 同意
               </el-button>
-              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row, 'refuse')">
                 拒绝
               </el-button>
             </template>
diff --git a/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
new file mode 100644
index 0000000..3d133c7
--- /dev/null
+++ b/src/views/business/schedule/certPrint/components/ApprovalDialogPart.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { agreeCert, refuseCert } from '@/api/business/cert'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  id: '', // 主键
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, id: string) {
+  if (id) {
+    formData.id = id
+  }
+  formData.type = type
+  formData.taskId = taskId
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type === 'agree') {
+          agreeCert({ taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+        else if (formData.type === 'refuse') {
+          refuseCert({ id: formData.id, taskId: formData.taskId, comments: formData.comments }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="80px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <el-radio label="reject" size="large">
+                驳回
+              </el-radio>
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" props="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/device/borrow/borrow-interface.ts b/src/views/device/borrow/borrow-interface.ts
deleted file mode 100644
index 9fd6678..0000000
--- a/src/views/device/borrow/borrow-interface.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// 设备借用申请查询参数类型
-export interface searchType {
-  applyName: string // 申请名称
-  applyNo: string // 申请编号
-  applyPerson: string // 	申请人
-  applyUnit: string // 	申请单位
-  approvalStatus?: string // 	审批状态
-  createUser?: string // 	创建人
-  processResult?: string // 	处置结果
-  applyType: string // 申请类型
-  time?: string // 	申请日期
-  limit?: number
-  offset?: number
-  ids?: string[]
-  id: string
-  formId?: string
-}
-// 借用设备类型
-export interface borrowDeviceType {
-  createUser?: string // 当前用户id
-  equipmentId: string // 设备id
-  equipmentNo: string // 设备编号
-  modelNo: string // 型号
-  measureRange: string // 测量范围
-  useDept: string // 使用部门
-  usePerson: string // 使用人
-  validDate: string // 有效日期
-  approvalStatusName: string
-  applyName: string
-  edit?: boolean
-  equipmentName?: string
-  id?: string
-}
diff --git a/src/views/device/borrow/borrow.ts b/src/views/device/borrow/borrow.ts
new file mode 100644
index 0000000..82880fc
--- /dev/null
+++ b/src/views/device/borrow/borrow.ts
@@ -0,0 +1,126 @@
+// 设备借用申请筛选
+export interface IlistQuery {
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  equipmentApplyProcessResult?: string // 设备申请处理结果 4待借用 5已借用
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  formId: string
+  offset: number
+  limit: number
+}
+
+// 设备借用申请表格
+export interface IlistType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+// 设备借用处理列表
+export interface IsolveListType {
+  id: string
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  time: string // 借用时间
+  applyDesc: string // 申请说明
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 借用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
+}
+
+export interface Iform {
+  company: string // 申请单位
+  person: string // 申请人
+  time: string // 申请时间
+  state: string // 申请说明
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+// 字典
+export interface dictType {
+  id: string
+  name: string
+  value: string | number
+  label?: string // 基本信息添加的信息名称
+}
+
+// 设备借用申请查询参数类型
+export interface searchType {
+  applyName: string // 申请名称
+  applyNo: string // 申请编号
+  applyPerson: string // 	申请人
+  applyUnit: string // 	申请单位
+  approvalStatus?: string // 	审批状态
+  createUser?: string // 	创建人
+  processResult?: string // 	处置结果
+  applyType: string // 申请类型
+  time?: string // 	申请日期
+  limit?: number
+  offset?: number
+  ids?: string[]
+  id: string
+  formId?: string
+}
+// 借用设备类型
+export interface borrowDeviceType {
+  createUser?: string // 当前用户id
+  equipmentId: string // 设备id
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  measureRange: string // 测量范围
+  useDept: string // 使用部门
+  usePerson: string // 使用人
+  validDate: string // 有效日期
+  approvalStatusName: string
+  applyName: string
+  edit?: boolean
+  equipmentName?: string
+  id?: string
+}
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 2f7a26f..c0c2553 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -1,53 +1,472 @@
 <!-- 设备借用处理 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/handleList.vue'
-export interface menuType {
-  name: string
-  comp: any
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
+
+import { getDictByCode } from '@/api/system/dict'
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '4', // 	审批状态
+  processResult: '1' || active.value, // 	处置结果 (3个状态字典值)
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnit',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPerson',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
+]) // 表格
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.processResult = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
-const menu = shallowRef<menuType[]>([
-  { name: '待借用', comp: list },
-  { name: '已借用', comp: list },
-  { name: '已归还', comp: list },
-])
-const current = ref('待借用')
-const currentComp = shallowRef(list)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowHandler', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowHandler') || '待借用'
-  sessionStorage.getItem('deviceBorrowHandler') ? sessionStorage.removeItem('deviceBorrowHandler') : ''
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态(已通过)
+    processResult: active.value, // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('equipmentApplyProcessResult')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '待借用' || item.name === '已借用'
+      || item.name === '已归还') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备处理申请列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+// 打印
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备处理申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备处理申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+// 标签识别
+const identify = () => {
+
+}
+
+// 借用
+const borrow = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认借用${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '借用成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 归还
+const returnBtn = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认归还${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    returnApply({ id: row.id as string }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '归还成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+const $router = useRouter()
+
+// 新增
+const addBtn = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用处理',
+    },
+  })
+}
+
+// 详情
+const detail = (row: IlistType) => {
+  $router.push({
+    path: '/borrow/borrowDetail',
+    query: {
+      id: row.id,
+      processId: row.processId, // 查询审批记录使用
+    },
+  })
+}
+
+// 删除
+const remove = (row: IlistType) => {
+  ElMessageBox.confirm(
+    `确认删除${row.applyName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      deleteApply({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
+  }
+  else {
+    active.value = menu.value.find(item => item.name === '待借用')!.id // 全部
+    activeTitle.value === '待借用'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
 })
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :status="current" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-device" title="标签识别" @click="identify" />
+        <icon-button icon="icon-export" title="导出" @click="exportExcelBtn" />
+        <icon-button icon="icon-print" title="打印" @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="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="primary" link @click="borrow(row)">
+                借用
+              </el-button>
+              <el-button v-if="activeTitle === '已借用'" size="small" type="primary" link @click="returnBtn(row)">
+                归还
+              </el-button>
+              <el-button v-if="activeTitle === '待借用'" size="small" type="danger" link @click="remove(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/borrwoApply.vue b/src/views/device/borrow/borrwoApply.vue
index 1c13501..89e09ef 100644
--- a/src/views/device/borrow/borrwoApply.vue
+++ b/src/views/device/borrow/borrwoApply.vue
@@ -1,74 +1,612 @@
 <!-- 设备借用申请 -->
 <script lang="ts" setup name="borrowApply">
-import list from './components/applyList.vue'
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ButtonBox from '@/components/buttonBox/buttonBox.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
+import type { IlistQuery, IlistType, dictType } from '@/views/device/receive/receive'
+import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
+import {
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+
 import { getDictByCode } from '@/api/system/dict'
-export interface menuType {
-  name: string
-  comp?: any
-  id?: string
-  value?: string
-}
-const menu = shallowRef<menuType[]>([
-  { name: '全部', comp: list },
-  { name: '草稿箱', comp: list },
-  { name: '待审批', comp: list },
-  { name: '审批中', comp: list },
-  { name: '已通过', comp: list },
-  { name: '未通过', comp: list },
-  { name: '已取消', comp: list },
+import { toTreeList } from '@/utils/structure'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getUserList } from '@/api/system/user'
+import { getDeptTreeList } from '@/api/system/dept'
+import { exportFile } from '@/utils/exportUtils'
+import { printJSON } from '@/utils/printUtils'
+const { proxy } = getCurrentInstance() as any
+const active = ref('') // 选中的按钮
+const activeTitle = ref('') // active对应的审批状态名字
+const approvalDialog = ref() // 审批对话框显隐
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+// 筛选时间段数据
+const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
+const loadingTable = ref(false) // 表格loading
+const list = ref<IlistType[]>([])// 表格数据
+const total = ref(20)// 页码总数
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const usePersonOptions = ref<userType[]>([]) // 申请人列表（用户）--模糊搜索数据
+const applyPersonLoading = ref(false) // 申请人模糊搜索框loading
+
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: active.value, // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '2', // 申请类型 借用2
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+  offset: 1,
+  limit: 20,
+})
+
+const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱}
+const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1}
+
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格数据
+const columns = ref([
+  {
+    text: '申请编号',
+    value: 'applyNo',
+    align: 'center',
+  },
+  {
+    text: '申请名称',
+    value: 'applyName',
+    align: 'center',
+  },
+  {
+    text: '申请部门',
+    value: 'applyUnitName',
+    align: 'center',
+  },
+  {
+    text: '申请人',
+    value: 'applyPersonName',
+    align: 'center',
+  },
+  {
+    text: '申请时间',
+    value: 'time',
+    align: 'center',
+  },
+  {
+    text: '审批状态',
+    value: 'approvalStatusName',
+    align: 'center',
+  },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(list)
-const statusList = ref<menuType[]>([])
-const type = ref('') // 当前状态的value
-watch(current, async (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-  if (statusList.value.length > 0) {
-    type.value = statusList.value.filter(item => item.name === newValue)[0].value || ''
+
+// 数据查询
+const fetchData = (isNowPage = false) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  listQuery.value.startTime = timeRange.value[0] as string || ''
+  listQuery.value.endTime = timeRange.value[1] as string || ''
+  listQuery.value.approvalStatus = active.value
+  getApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap.value[item.approvalStatus],
+
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+
+// 获取字典值
+const getDict = async () => {
+  // 审批状态
+  const res = await getDictByCode('approvalStatus')
+  // 审批状态字典 {1：草稿箱}
+  res.data.forEach((item: any) => {
+    approvalStatusMap.value[`${item.value}`] = item.name
+  })
+
+  // 审批状态字典 {草稿箱: 1}
+  res.data.forEach((item: any) => {
+    approvalStatusReserveMap.value[item.name] = `${item.value}`
+  })
+
+  // 制作右上角的菜单
+  res.data.forEach((item: dictType) => {
+    if (item.name === '全部' || item.name === '草稿箱'
+      || item.name === '待审批' || item.name === '审批中'
+      || item.name === '已通过' || item.name === '未通过'
+      || item.name === '已取消') {
+      menu.value.push({
+        name: item.name,
+        id: `${item.value}`,
+      })
+    }
+  })
+}
+
+const clearList = () => {
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: active.value, // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '2', // 申请类型 借用2
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
+}
+
+// 切换tab状态
+const changeCurrentButton = (val: string) => {
+  active.value = val
+  activeTitle.value = menu.value.find(item => item.id === val)!.name
+  window.sessionStorage.setItem('buttonBoxActive', val)
+  clearList()
+}
+
+// 获取用户列表(增加模糊查询)
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+    usePersonOptions.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  await getDict() // 获取字典-审批状态
+  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
+    active.value = window.sessionStorage.getItem('buttonBoxActive')!
   }
   else {
-    getDictByCode('approvalStatus').then((res) => {
-      statusList.value = (res.data as menuType[])
-      type.value = res.data.filter((item: menuType) => item.name === newValue)[0].value
+    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+    activeTitle.value === '全部'
+  }
+  nextTick(() => {
+    fetchData(true) // 获取表格数据
+    fetchDeptTreeList() // 获取使用部门
+    fetchUserList() // 获取人员列表
+  })
+})
+const $router = useRouter()
+
+onUnmounted(() => {
+  window.sessionStorage.setItem('buttonBoxActive', '') // 清除
+})
+
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用0
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_BORROW_APPROVAL,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    // 调导出接口
+    exportApply(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备借用申请列表.xlsx')
     })
   }
-}, {
-  immediate: true,
-  deep: true,
-})
-onUnmounted(() => {
-  sessionStorage.setItem('deviceBorrowApply', current.value)
-})
-onMounted(() => {
-  current.value = sessionStorage.getItem('deviceBorrowApply') || '全部'
-  sessionStorage.getItem('deviceBorrowApply') ? sessionStorage.removeItem('deviceBorrowApply') : ''
-})
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备借用申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: IlistType) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备借用申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择器模糊查询
+const remoteMethod = (query: string) => {
+  if (query) {
+    applyPersonLoading.value = true
+    setTimeout(() => {
+      applyPersonLoading.value = false
+      usePersonOptions.value = usePersonList.value.filter((item) => {
+        return item.name.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  }
+  else {
+    usePersonOptions.value = usePersonList.value
+  }
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 新建
+const add = () => {
+  $router.push({
+    name: 'stateManageDetail',
+    params: {
+      type: 'add',
+    },
+    query: {
+      title: '新建',
+      name: '设备借用申请',
+      applyType: '2',
+    },
+  })
+}
+
+// 操作
+const handleEdit = (row: IlistType, val: string, title = '') => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '删除') {
+    ElMessageBox.confirm(
+      '确认删除该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        deleteApply({ id: row.id, taskId: row.taskId }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else if (val === '提交') {
+    ElMessageBox.confirm(
+      '确认提交该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitReceiveApplyList({ id: row.id, formId: SCHEDULE.DEVICE_BORROW_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (val === '驳回') {
+    approvalDialog.value.initDialog('reject', row.taskId)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId)
+  }
+  else if (val === '查看' || val === '编辑') {
+    if (val === '查看') {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'detail',
+        },
+        query: {
+          id: row.id,
+          title: '详情',
+          name: '设备借用申请',
+          approvalStatus: active.value,
+          approvalStatusName: row.approvalStatusName,
+        },
+      })
+    }
+    else {
+      $router.push({
+        name: 'stateManageDetail',
+        params: {
+          type: 'edit',
+        },
+        query: {
+          id: row.id,
+          title: '编辑',
+          name: '设备借用申请',
+        },
+      })
+    }
+    // $router.push({
+    //   path: `/receive/${title}`,
+    //   query: {
+    //     typeValue: title,
+    //     approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+    //     id: row.id,
+    //     taskId: row.taskId,
+    //     processId: row.processId,
+    //   },
+    // })
+  }
+}
 </script>
 
 <template>
-  <div class="container">
-    <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
-          {{ item.name }}
-        </el-radio-button>
-      </el-radio-group>
-    </div>
-    <!-- 展示区域 -->
-    <component :is="currentComp" :name="current" :type="type" apply-type="2" />
-  </div>
+  <app-container>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyNo"
+          placeholder="申请编号"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.applyName"
+          placeholder="申请名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.applyPerson"
+          placeholder="请选择申请人"
+          style="width: 100%;"
+          filterable
+          remote
+          remote-show-suffix
+          :remote-method="remoteMethod"
+          :loading="applyPersonLoading"
+        >
+          <el-option v-for="item in usePersonOptions" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="到"
+          format="YYYY-MM-DD hh:mm"
+          value-format="YYYY-MM-DD hh:mm"
+          start-placeholder="申请开始时间"
+          end-placeholder="申请结束时间"
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/receive/applyList/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="(activeTitle === '全部') ? 220 : (activeTitle === '草稿箱' || activeTitle === '已取消' || activeTitle === '审批中') ? 150 : (activeTitle === '已通过' || activeTitle === '未通过') ? 70 : 200"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, '查看', 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="primary"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 3"
+                @click="handleEdit(row, '驳回')"
+              >
+                驳回
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (activeTitle === '全部' || activeTitle === '待审批')"
+                size="small"
+                link
+                type="danger"
+                :disabled="(row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中') || row.decisionItem === 1 || row.decisionItem === 2"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (activeTitle === '草稿箱' || activeTitle === '已取消')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (activeTitle === '全部' || activeTitle === '审批中')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (activeTitle !== '已通过' && activeTitle !== '未通过')"
+                size="small"
+                link
+                type="danger"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+    <button-box :active="active" :menu="menu" @changeCurrentButton="changeCurrentButton" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
 </template>
 
 <style lang="scss" scoped>
-.container {
-  position: relative;
-
-  .btns {
-    position: fixed;
-    top: 67px;
-    right: 15px;
-    z-index: 999;
-  }
-}
+// 样式
 </style>
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 0785ce9..cb69092 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="borrowApplyList">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { borrowDeviceType } from '../borrow-interface'
+import type { borrowDeviceType } from '../borrow'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { cancelApproval, deleteApply, exportApply, getApplyList, submitApply } from '@/api/device/borrow'
 import {
   submitReceiveApplyList,
 } from '@/api/device/receive'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { getDeptTreeList } from '@/api/system/dept'
diff --git a/src/views/device/borrow/components/handleList.vue b/src/views/device/borrow/components/handleList.vue
index 544ef34..bf1d19c 100644
--- a/src/views/device/borrow/components/handleList.vue
+++ b/src/views/device/borrow/components/handleList.vue
@@ -2,7 +2,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import approveAction from './approvalActionDialog.vue'
 import { deleteApply, exportApply, getApplyList, returnApply, submitApply } from '@/api/device/borrow'
-import type{ searchType } from '@/views/device/borrow/borrow-interface'
+import type{ searchType } from '@/views/device/borrow/borrow'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
new file mode 100644
index 0000000..8a92582
--- /dev/null
+++ b/src/views/device/borrow/editHandle.vue
@@ -0,0 +1,257 @@
+<script lang="ts" setup name="Detail">
+import { onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElLoading } from 'element-plus'
+import type { Ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../borrow'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getReceiveApplyListDetail } from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import { getUserList } from '@/api/system/user'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+
+const $route = useRoute()
+const { proxy } = getCurrentInstance() as any
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const total = ref(20)// 总数
+// 表单数据
+const form = ref({
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 借用时间
+  applyDesc: '', // 申请说明
+})
+const list = ref<IdeviceList[]>([])// 表格数据
+// 查询条件
+const listQuery: Ref<IdeviceListQuery> = ref({
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
+  offset: 1,
+  limit: 20,
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '设备编号', value: 'equipmentNo', align: 'center', width: '230' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDeptName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    form.value.applyName = res.data.applyName// 申请名称
+    form.value.applyPerson = res.data.applyPerson// 申请人
+    form.value.time = res.data.time // 借用时间
+    form.value.applyDesc = res.data.applyDesc // 申请说明
+    list.value = res.data.equipmentInfoList.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: dayjs(item.validDate).format('YYYY-MM-DD'),
+      }
+    })
+    loading.close()
+  })
+}
+
+// 点击关闭
+const $router = useRouter()
+const close = () => {
+  $router.back()
+}
+
+// 打印
+const printObj = ref({
+  id: 'lysq', // 需要打印元素的id
+  popTitle: '设备借用处理', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备借用处理</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 获取用户列表--（是否有不分页接口？）
+const fetchUserList = () => {
+  getUserList({ offset: 1, limit: 999999 }).then((res: any) => {
+    usePersonList.value = res.data.rows
+  })
+}
+
+// 获取使用部门
+const fetchDeptTreeList = () => {
+  getDeptTreeList().then((res: any) => {
+    if (res.data) { // 将列表转树结构
+      useDeptList.value = toTreeList(res.data, '0', true)
+    }
+  })
+}
+
+onMounted(async () => {
+  form.value.id = $route.query.id as string // id
+  form.value.processId = $route.query.processId as string // 任务id
+
+  // 获取部门信息
+  await fetchDeptTreeList()
+  // 获取人员列表
+  await fetchUserList()
+  // 编辑、详情获取详情页信息
+  fetchReceiveApplyListDetail() // 获取详细信息
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备借用处理-详情">
+      <template #btns>
+        <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div id="lysq" class="lysq-create-check">
+      <div class="top-info">
+        <detail-block title="借用处理">
+          <div class="form-area">
+            <el-form
+              ref="ruleFormRef"
+              :model="form"
+              label-width="120px"
+            >
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="申请名称" prop="applyName">
+                    <el-input v-model="form.applyName" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="申请人" prop="applyPerson">
+                    <el-select v-model="form.applyPerson" disabled style="width: 100%;">
+                      <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="借用时间" prop="time">
+                    <el-date-picker
+                      v-model="form.time"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </detail-block>
+      </div>
+      <detail-block title="设备借用列表">
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
+      </detail-block>
+      <detail-block title="审批流程">
+        <approval-record :process-id="form.processId" />
+      </detail-block>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.lysq-create-check {
+  margin-top: 10px;
+
+  .top-info {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    padding-right: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    // padding: 10px;
+
+    .title-button {
+      display: flex;
+      align-items: center;
+
+      &::before {
+        content: "";
+        flex: 1;
+      }
+
+      .button-group {
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+
+    .form-area {
+      margin-top: 40px;
+    }
+  }
+}
+</style>
+
+<style lang="scss">
+.lysq-create-check {
+  .el-form-item--default .el-form-item__label {
+    color: #000;
+  }
+}
+</style>
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d4ac6a6..dc2d9f9 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -26,6 +26,7 @@
   time: string // 领用时间
   applyDesc: string // 申请说明
   approvalStatus: string // 	审批状态
+  approvalStatusName: string // 审批状态名称
   processResult: string // 	处置结果
   applyType: string // 申请类型 领用0
   createUser: string // 创建人
diff --git a/src/views/device/stateManage/components/selectDeviceDialog.vue b/src/views/device/stateManage/components/selectDeviceDialog.vue
new file mode 100644
index 0000000..4e503c5
--- /dev/null
+++ b/src/views/device/stateManage/components/selectDeviceDialog.vue
@@ -0,0 +1,172 @@
+<!-- 选择设备对话框 -->
+<script lang="ts" setup name="ReceiveDialog">
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import type { IdeviceList } from './status-interface'
+import useUserStore from '@/store/modules/user'
+import { listPageApi } from '@/api/device/standingBook'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+const props = defineProps({
+  dialogSelectDiviceVisible: {
+    type: Boolean,
+    default: false,
+  },
+  isMulti: Boolean,
+})
+const emits = defineEmits(['closeDialog', 'updateDeviceConfirm'])
+const loadingTable = ref<boolean>(false)
+const userStore = useUserStore()
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const total = ref(20)
+// 多选选中的内容
+const checkoutList = ref([])
+
+const list = ref([])// 表格数据
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', fixed: true },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', fixed: true },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '管理状态', value: 'managerStateName', align: 'center' },
+  { text: '使用人', value: 'usePersonName', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
+])
+const table = ref()
+const dialogTableVisible = ref(false)// 控制对话框显隐
+
+// 获取数据列表
+const fetchData = () => {
+  loadingTable.value = true
+  listPageApi(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IdeviceList) => {
+      return {
+        ...item,
+        validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : item.validDate,
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+watch(() => props.dialogSelectDiviceVisible, (newValue) => {
+  dialogTableVisible.value = newValue
+  fetchData()
+  if (!newValue) {
+    table.value.clearMulti() // 清除多选选中
+  }
+})
+// 关闭对话框
+const close = () => {
+  emits('closeDialog')
+}
+// 确认
+const confirm = () => {
+  emits('updateDeviceConfirm', checkoutList.value)
+  close()
+}
+// 重置
+const clearList = () => {
+  listQuery.value.equipmentName = ''
+  listQuery.value.equipmentNo = ''
+  fetchData()
+}
+// 搜索
+const searchList = () => {
+  fetchData()
+}
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  console.log('多选', val)
+  checkoutList.value = val
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogTableVisible" width="60%" title="选择设备" class="select-device-dialog" @close="close">
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <table-container>
+      <normal-table
+        ref="table"
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :is-multi="isMulti"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.receive-dialog {
+  .receive-dialog-item {
+    display: flex;
+    align-items: center;
+    margin-bottom: 28px;
+
+    .text {
+      margin-right: 30px;
+      white-space: nowrap;
+    }
+  }
+}
+</style>
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 0ef0e90..6f258bc 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -1,27 +1,78 @@
+// 设备状态管理搜索
+
+export interface ISearchQuery {
+  applyNo: string // 申请编号
+  applyStatus: string // 申请状态
+  applyUnit: string // 申请单位
+  approvalStatus: number // 审批状态
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  ids: [] // 选中设备数据
+  limit: number
+  offset: number
+  applyType: string // 申请类型
+  formId: string // 表单id
+}
+
 // 设备闲置申请表格行
-export interface TableRow {
-  applyNo: string
-  applyPerson: string
-  applyType: string
-  applyTypeName: string
-  applyUnit: string
-  approvalStatus: string
-  approvalStatusName: string
-  createTime: string
-  createUser: string
-  equipmentName: string
-  equipmentNo: string
-  fileList: string
-  id: number
-  isDel: number
-  managerState: string
-  managerStateName: string
-  modelNo: string
-  processId: string
-  processResult: string
-  remark: string
+export interface ITableRow {
+  applyNo: string // 申请编号
+  applyPerson: string // 申请名称
+  applyType: string // 申请类型
+  applyTypeName: string // 申请类型名称
+  applyUnit: string // 申请部门
+  approvalStatus: string // 申请状态码
+  approvalStatusName: string // 申请状态名称
+  createTime: string // 创建时间
+  createUser: string // 创建人
+  equipmentName: string // 设备名称
+  equipmentNo: string // 设备编号
+  fileList: string // 文件列表
+  id: number // 主键id
+  isDel: number // 删除标记
+  managerState: string //  管理状态
+  managerStateName: string // 管理状态名称
+  modelNo: string // 型号
+  processId: string // 流程id
+  processResult: string // 流程结果
+  remark: string // 备注
+  taskId: string // 任务id
+  time: string // 时间
+  updateTime: string // 修改时间
+  version: string // 版本
+}
+
+// 删除/提交/取消
+export interface Iapprove {
+  id: string
   taskId: string
-  time: string
-  updateTime: string
-  version: string
+  formId?: string
+  processInstanceId?: string
+}
+
+export interface IdeviceList {
+  id?: string
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+}
+
+export interface IdeviceListQuery {
+  equipmentName: string // 仪器名称
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
+  offset: number
+  limit: number
 }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 6c6ed79..2253668 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -2,7 +2,9 @@
 <script lang="ts" setup name="add">
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
+import type { IdeviceList, IdeviceListQuery } from '../status-interface'
 import addRow from './addRow.vue'
+import SelectDeviceDialog from './selectDeviceDialog.vue'
 import approveAction from './approvalActionDialog.vue'
 import type { deptType, selectType } from '@/views/device/standingBook/standingBook-interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -14,7 +16,7 @@
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, deleteApply, detailApply, editApply, submitApply } from '@/api/device/borrow'
 import { addStatus, detailStatus, updateStatus } from '@/api/device/stateManage'
-import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 import { SCHEDULE } from '@/utils/scheduleDict'
 
@@ -25,7 +27,10 @@
 const ruleFormRef2 = ref() // from组件
 const title = ref('')
 const name = ref('')
-const borrowList = ref<borrowDeviceType[]>([])
+const isMulti = ref(false) // 是否批量添加(允许多选)
+const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
+const selectIndex = ref() // 点击选择的index--点击第几行
+const borrowList = ref<IdeviceList[]>([])
 interface EquipmentListRow {
   equipmentId: string
 }
@@ -194,7 +199,6 @@
 // 弹窗初始化
 const initDialog = (row: any) => {
   fetchData()
-  // ruleFormRef.value?.resetFields()
   title.value = row.title
   name.value = row.name
   if (isDevice.value) {
@@ -203,7 +207,6 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        // borrowList.value = res.data.equipmentList 接口返回数据为空
         borrowList.value = res.data.equipmentInfoList
       })
     }
@@ -248,6 +251,7 @@
         if (title.value === '新建') {
           addApply(params).then((res) => {
             if (res.code === 200) {
+              ruleForm2.value.id = res.data
               ElMessage.success('保存成功')
             }
           })
@@ -256,6 +260,7 @@
           editApply(params).then((res) => {
             if (res.code === 200) {
               // 成功
+              ruleForm2.value.id = res.data
               ElMessage.success('操作成功')
               $router.go(-1)
             }
@@ -489,52 +494,50 @@
   },
 ])
 const addRowRef = ref()
-// 添加行
-const addRowBtn = () => {
-  // if (checkPersonList()) {
-  //   setAllRowReadable()
-  //   console.log(borrowList.value)
-  //   borrowList.value.push({
-  //     equipmentName: '', // 设备名称
-  //     createUser: userInfo.$state.id, // 当前用户id   1
-  //     equipmentId: '', // 设备id 1
-  //     equipmentNo: '', // 设备编号
-  //     modelNo: '', // 型号
-  //     measureRange: '', // 测量范围 1
-  //     useDept: '', // 使用部门 1
-  //     usePerson: '', // 使用人 1
-  //     validDate: '', // 有效日期
-  //     edit: true,
-  //   })
-  // }
-  addRowRef.value.initDialog({ title: '' })
-}
 const SelectionList = ref()
 // 表格选中
-const handleSelectionChange = (e) => {
+const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-// 删除行
-// const removeRowBtn = () => {
-//   const removeArr = borrowList.value.filter(item => item.remove !== '')
-//   if (removeArr.length) {
-//     ElMessageBox.confirm(
-//       '确认删除选中的数据吗？',
-//       '提示',
-//       {
-//         confirmButtonText: '确认',
-//         cancelButtonText: '取消',
-//         type: 'warning',
-//       },
-//     ).then(() => {
-//       borrowList.value = borrowList.value.filter(item => item.remove === '')
-//       ElMessage.success('删除成功')
-//     })
-//   }
-//   else {
-//     ElMessage.warning('请先选择需要删除的数据')
-//   }
-// }
+
+// 添加行
+const addRowButton = () => {
+  const index = borrowList.value.findIndex(item => !item.equipmentNo)
+  if (index !== -1) {
+    ElMessage.warning('请完善上一条设备信息')
+    return
+  }
+  borrowList.value.push({
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
+  })
+}
+
+const delRowButton = () => {
+  if (SelectionList.value.length <= 0) {
+    ElMessage({
+      message: '请选中要删除的行',
+      type: 'warning',
+    })
+  }
+  else {
+    SelectionList.value.forEach((item: IdeviceListQuery) => {
+      borrowList.value.forEach((element, index) => {
+        if (element.equipmentNo === item.equipmentNo) {
+          borrowList.value.splice(index, 1)
+        }
+      })
+    })
+  }
+}
+
 // 删除行
 const removeRowBtn = () => {
   borrowList.value = borrowList.value.filter((item) => {
@@ -542,7 +545,7 @@
   })
 }
 // 借用设备列表添加
-const addRowMethods = (row) => {
+const addRowMethods = (row: IdeviceListQuery) => {
   if (isDevice.value) {
     // 设备借用
     borrowList.value = [...borrowList.value, ...row]
@@ -608,6 +611,45 @@
     return false
   }
 })
+
+// 点击选择
+const handleSelect = (index: number, row: borrowDeviceType) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
+  selectIndex.value = index
+}
+
+// 点击批量添加
+const multiAdd = () => {
+  dialogSelectDiviceVisible.value = true
+  isMulti.value = true
+}
+
+// 选择设备对话框关闭
+const closeDialog = () => {
+  dialogSelectDiviceVisible.value = false
+}
+
+// 选择好设备了, 添加选好的设备到表格中
+const updateDeviceConfirm = (val: Array<IdeviceList>) => {
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = borrowList.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        borrowList.value.push(item)
+      }
+    })
+  }
+  else { // 单选替换
+    const index = borrowList.value.findIndex((i: IdeviceList) => val[0].equipmentNo === i.equipmentNo)
+    if (index !== -1) {
+      ElMessage.warning('此设备已添加过')
+      return
+    }
+    borrowList.value.splice(selectIndex.value, 1, val[0])
+  }
+}
 </script>
 
 <template>
@@ -774,52 +816,58 @@
       </el-form>
     </detail-page>
     <div>
+      <!-- 表格 -->
       <detail-block v-if="isDevice" title="借用设备列表">
         <template #btns>
-          <el-button v-if="title !== '详情'" type="primary" @click="addRowBtn">
-            添加行
+          <el-button v-if="title !== '详情'" type="primary" @click="multiAdd">
+            批量添加
           </el-button>
-          <el-button v-if="title !== '详情'" type="info" @click="removeRowBtn">
+          <el-button v-if="title !== '详情'" type="primary" @click="addRowButton">
+            增加行
+          </el-button>
+          <el-button v-if="title !== '详情'" type="info" @click="delRowButton">
             删除行
           </el-button>
         </template>
-        <el-table ref="multipleTableRef" :data="borrowList || []" style="width: 100%;" border @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="38" />
+        <el-table
+          :data="borrowList || []"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column v-if="title !== '详情'" type="selection" width="38" />
           <el-table-column align="center" label="序号" width="80" type="index" />
-          <el-table-column v-for="item in columns" :key="item.value" :prop="item.value" :label="item.text" align="center">
-            <template #header>
-              <span>{{ item.text }}</span>
-            </template>
-            <template #default="scope">
-              <span>{{ scope.row[item.value]
-              }}</span>
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (title !== '详情')" #default="scope">
+              <el-input v-model="scope.row.equipmentNo" placeholder="请选择设备" class="input">
+                <template #append>
+                  <el-button size="small" @click="handleSelect(scope.$index, scope.row)">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </template>
           </el-table-column>
         </el-table>
       </detail-block>
       <!-- <detail-block v-if="title !== '新建'" title="审批流程">
-        <el-timeline>
-          <el-timeline-item timestamp="2018/4/12" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/12 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/3" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/3 20:46</p>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="2018/4/2" placement="top">
-            <el-card>
-              <h4>Update Github template</h4>
-              <p>Tom committed 2018/4/2 20:46</p>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
       </detail-block> -->
     </div>
+    <select-device-dialog
+      :dialog-select-divice-visible="dialogSelectDiviceVisible"
+      :is-multi="isMulti"
+      @closeDialog="closeDialog"
+      @updateDeviceConfirm="updateDeviceConfirm"
+    />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/components/templateAddEditCancel.vue b/src/views/device/stateManage/components/templateAddEditCancel.vue
index bf71edd..8f9aeb4 100644
--- a/src/views/device/stateManage/components/templateAddEditCancel.vue
+++ b/src/views/device/stateManage/components/templateAddEditCancel.vue
@@ -13,7 +13,7 @@
 import { toTreeList } from '@/utils/structure'
 import type { userType } from '@/views/system/user/user-interface'
 import { addApply, detailApply } from '@/api/device/borrow'
-import type { borrowDeviceType } from '@/views/device/borrow/borrow-interface'
+import type { borrowDeviceType } from '@/views/device/borrow/borrow'
 import useUserStore from '@/store/modules/user'
 const userInfo = useUserStore()
 const $router = useRouter()
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index b533114..3dbb3e6 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -1,7 +1,7 @@
 <!-- 状态管理公共列表组件 -->
 <script lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { TableRow } from './status-interface'
+import type { ITableRow } from './status-interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import {
   cancelStatus,
@@ -167,7 +167,7 @@
         // 根据闲置，封存，启封等状态获取不同的列表
         getStatusList(searchQuery).then((res) => {
           if (res.code === 200) {
-            list.value = res.data.rows.map((item: TableRow) => {
+            list.value = res.data.rows.map((item: ITableRow) => {
               return {
                 ...item,
                 approvalStatus: approvalStatusMap[item.approvalStatus],
@@ -194,7 +194,7 @@
   getList()
 }
 // 详情
-const detail = (row: TableRow) => {
+const detail = (row: ITableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -209,7 +209,7 @@
   })
 }
 // 编辑
-const update = (row: TableRow) => {
+const update = (row: ITableRow) => {
   $router.push({
     name: 'stateManageDetail',
     params: {
@@ -224,7 +224,7 @@
   })
 }
 // 删除
-const remove = (row: TableRow) => {
+const remove = (row: ITableRow) => {
   const { id } = row
   ElMessageBox.confirm(`确认删除${row.equipmentName}吗？`, '提示', {
     confirmButtonText: '确认',
@@ -243,19 +243,24 @@
   })
 }
 // 同意
-const agree = (row: TableRow) => {
+const agree = (row: ITableRow) => {
   approvalDialog.value.initDialog('agree', row.taskId)
 }
 // 驳回
-const reject = (row: TableRow) => {
+const reject = (row: ITableRow) => {
   approvalDialog.value.initDialog('reject', row.taskId)
 }
 // 拒绝
-const refuse = (row: TableRow) => {
+const refuse = (row: ITableRow) => {
   approvalDialog.value.initDialog('refuse', row.taskId)
 }
+
+// 审批结束回调
+const approvalSuccess = () => {
+  getList()
+}
 // 取消
-const cancel = (row: TableRow) => {
+const cancel = (row: ITableRow) => {
   const { processId } = row
   ElMessageBox.confirm('确认取消吗？', '提示', {
     confirmButtonText: '确认',
@@ -275,7 +280,7 @@
 }
 
 // 提交
-const submit = (row: TableRow) => {
+const submit = (row: ITableRow) => {
   // 流程id为空
   const { id } = row
   ElMessageBox.confirm('确认提交吗？', '提示', {
@@ -322,9 +327,9 @@
   })
 }
 // 表格被选中的行
-const selectList = ref<TableRow[]>([])
+const selectList = ref<ITableRow[]>([])
 // 表格多选
-const multiSelect = (row: TableRow[]) => {
+const multiSelect = (row: ITableRow[]) => {
   selectList.value = row
 }
 // 打印
@@ -340,7 +345,7 @@
     printJSON(list.value, properties, props.name)
   }
   else if (selectIds.length > 0) {
-    const printList = list.value.filter((item: TableRow) =>
+    const printList = list.value.filter((item: ITableRow) =>
       selectIds.includes(item.id),
     )
     printJSON(printList, properties, props.name)